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

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


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

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

mesa: make _mesa_copy_buffer_sub_data() static

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

---

 src/mesa/main/bufferobj.c | 18 ++++++++----------
 src/mesa/main/bufferobj.h |  7 -------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 326e901713..0a8f030d25 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -2280,12 +2280,10 @@ _mesa_GetNamedBufferPointerv(GLuint buffer, GLenum pname, GLvoid **params)
 }
 
 
-void
-_mesa_copy_buffer_sub_data(struct gl_context *ctx,
-                           struct gl_buffer_object *src,
-                           struct gl_buffer_object *dst,
-                           GLintptr readOffset, GLintptr writeOffset,
-                           GLsizeiptr size, const char *func)
+static void
+copy_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *src,
+                     struct gl_buffer_object *dst, GLintptr readOffset,
+                     GLintptr writeOffset, GLsizeiptr size, const char *func)
 {
    if (_mesa_check_disallowed_mapping(src)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -2369,8 +2367,8 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
    if (!dst)
       return;
 
-   _mesa_copy_buffer_sub_data(ctx, src, dst, readOffset, writeOffset, size,
-                              "glCopyBufferSubData");
+   copy_buffer_sub_data(ctx, src, dst, readOffset, writeOffset, size,
+                        "glCopyBufferSubData");
 }
 
 void GLAPIENTRY
@@ -2391,8 +2389,8 @@ _mesa_CopyNamedBufferSubData(GLuint readBuffer, GLuint writeBuffer,
    if (!dst)
       return;
 
-   _mesa_copy_buffer_sub_data(ctx, src, dst, readOffset, writeOffset, size,
-                              "glCopyNamedBufferSubData");
+   copy_buffer_sub_data(ctx, src, dst, readOffset, writeOffset, size,
+                        "glCopyNamedBufferSubData");
 }
 
 static bool
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 3525a4bbe7..fefb01311b 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -152,13 +152,6 @@ _mesa_buffer_unmap_all_mappings(struct gl_context *ctx,
                                 struct gl_buffer_object *bufObj);
 
 extern void
-_mesa_copy_buffer_sub_data(struct gl_context *ctx,
-                           struct gl_buffer_object *src,
-                           struct gl_buffer_object *dst,
-                           GLintptr readOffset, GLintptr writeOffset,
-                           GLsizeiptr size, const char *func);
-
-extern void
 _mesa_ClearBufferSubData_sw(struct gl_context *ctx,
                             GLintptr offset, GLsizeiptr size,
                             const GLvoid *clearValue,




More information about the mesa-commit mailing list