summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-05-04 13:59:29 +1000
committerTimothy Arceri <[email protected]>2017-05-07 15:29:33 +1000
commitf9c28b9f879d1505824640314ba87a959ad18d69 (patch)
treec2e7b82b07332a3ec37f247b5b0c1dc8bfd31d3e
parent426e4765d26d37ecda920cb8cccc0cba17def6fc (diff)
mesa: make _mesa_clear_buffer_sub_data() static
Reviewed-by: Eric Anholt <[email protected]>
-rw-r--r--src/mesa/main/bufferobj.c33
-rw-r--r--src/mesa/main/bufferobj.h9
2 files changed, 13 insertions, 29 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 9e96f31017f..326e901713b 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1876,14 +1876,11 @@ _mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
/**
* \param subdata true if caller is *SubData, false if *Data
*/
-void
-_mesa_clear_buffer_sub_data(struct gl_context *ctx,
- struct gl_buffer_object *bufObj,
- GLenum internalformat,
- GLintptr offset, GLsizeiptr size,
- GLenum format, GLenum type,
- const GLvoid *data,
- const char *func, bool subdata)
+static void
+clear_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+ GLenum internalformat, GLintptr offset, GLsizeiptr size,
+ GLenum format, GLenum type, const GLvoid *data,
+ const char *func, bool subdata)
{
mesa_format mesaFormat;
GLubyte clearValue[MAX_PIXEL_BYTES];
@@ -1943,9 +1940,8 @@ _mesa_ClearBufferData(GLenum target, GLenum internalformat, GLenum format,
if (!bufObj)
return;
- _mesa_clear_buffer_sub_data(ctx, bufObj, internalformat, 0, bufObj->Size,
- format, type, data,
- "glClearBufferData", false);
+ clear_buffer_sub_data(ctx, bufObj, internalformat, 0, bufObj->Size,
+ format, type, data, "glClearBufferData", false);
}
void GLAPIENTRY
@@ -1959,9 +1955,8 @@ _mesa_ClearNamedBufferData(GLuint buffer, GLenum internalformat,
if (!bufObj)
return;
- _mesa_clear_buffer_sub_data(ctx, bufObj, internalformat, 0, bufObj->Size,
- format, type, data,
- "glClearNamedBufferData", false);
+ clear_buffer_sub_data(ctx, bufObj, internalformat, 0, bufObj->Size,
+ format, type, data, "glClearNamedBufferData", false);
}
@@ -1978,9 +1973,8 @@ _mesa_ClearBufferSubData(GLenum target, GLenum internalformat,
if (!bufObj)
return;
- _mesa_clear_buffer_sub_data(ctx, bufObj, internalformat, offset, size,
- format, type, data,
- "glClearBufferSubData", true);
+ clear_buffer_sub_data(ctx, bufObj, internalformat, offset, size,
+ format, type, data, "glClearBufferSubData", true);
}
void GLAPIENTRY
@@ -1997,9 +1991,8 @@ _mesa_ClearNamedBufferSubData(GLuint buffer, GLenum internalformat,
if (!bufObj)
return;
- _mesa_clear_buffer_sub_data(ctx, bufObj, internalformat, offset, size,
- format, type, data,
- "glClearNamedBufferSubData", true);
+ clear_buffer_sub_data(ctx, bufObj, internalformat, offset, size, format,
+ type, data, "glClearNamedBufferSubData", true);
}
static GLboolean
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index c7c89a9375f..3525a4bbe73 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -165,15 +165,6 @@ _mesa_ClearBufferSubData_sw(struct gl_context *ctx,
GLsizeiptr clearValueSize,
struct gl_buffer_object *bufObj);
-extern void
-_mesa_clear_buffer_sub_data(struct gl_context *ctx,
- struct gl_buffer_object *bufObj,
- GLenum internalformat,
- GLintptr offset, GLsizeiptr size,
- GLenum format, GLenum type,
- const GLvoid *data,
- const char *func, bool subdata);
-
/*
* API functions
*/