Mesa (master): mesa: make _mesa_buffer_storage() static

Timothy Arceri tarceri at kemper.freedesktop.org
Sun May 7 05:37:07 UTC 2017


Module: Mesa
Branch: master
Commit: 123b113f957af15eeedfdf959bc77dd363106aef
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=123b113f957af15eeedfdf959bc77dd363106aef

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Thu May  4 14:06:57 2017 +1000

mesa: make _mesa_buffer_storage() static

Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/main/bufferobj.c | 15 +++++++--------
 src/mesa/main/bufferobj.h |  5 -----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 0a8f030d25..61612712ad 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1505,10 +1505,10 @@ _mesa_IsBuffer(GLuint id)
 }
 
 
-void
-_mesa_buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
-                     GLenum target, GLsizeiptr size, const GLvoid *data,
-                     GLbitfield flags, const char *func)
+static void
+buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+               GLenum target, GLsizeiptr size, const GLvoid *data,
+               GLbitfield flags, const char *func)
 {
    if (size <= 0) {
       _mesa_error(ctx, GL_INVALID_VALUE, "%s(size <= 0)", func);
@@ -1596,8 +1596,7 @@ _mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
    if (!bufObj)
       return;
 
-   _mesa_buffer_storage(ctx, bufObj, target, size, data, flags,
-                        "glBufferStorage");
+   buffer_storage(ctx, bufObj, target, size, data, flags, "glBufferStorage");
 }
 
 void GLAPIENTRY
@@ -1615,8 +1614,8 @@ _mesa_NamedBufferStorage(GLuint buffer, GLsizeiptr size, const GLvoid *data,
     * In direct state access, buffer objects have an unspecified target since
     * they are not required to be bound.
     */
-   _mesa_buffer_storage(ctx, bufObj, GL_NONE, size, data, flags,
-                        "glNamedBufferStorage");
+   buffer_storage(ctx, bufObj, GL_NONE, size, data, flags,
+                  "glNamedBufferStorage");
 }
 
 
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index fefb01311b..93a360dcb6 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -133,11 +133,6 @@ extern void
 _mesa_init_buffer_object_functions(struct dd_function_table *driver);
 
 extern void
-_mesa_buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
-                     GLenum target, GLsizeiptr size, const GLvoid *data,
-                     GLbitfield flags, const char *func);
-
-extern void
 _mesa_buffer_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
                   GLenum target, GLsizeiptr size, const GLvoid *data,
                   GLenum usage, const char *func);




More information about the mesa-commit mailing list