aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Ekstrand <[email protected]>2015-01-20 15:24:53 -0800
committerLaura Ekstrand <[email protected]>2015-03-17 10:18:34 -0700
commit23eab47bbe998b95d5da889b85b7b0ca6e14385b (patch)
treeecf9688288c061313b08afd0e9c2420983e9eeb9
parent3706ace2446825b9544e45800c0ce1df261a1c30 (diff)
main: Add entry point for GetNamedBufferSubData.
Reviewed-by: Fredrik Höglund <[email protected]>
-rw-r--r--src/mapi/glapi/gen/ARB_direct_state_access.xml7
-rw-r--r--src/mesa/main/bufferobj.c22
-rw-r--r--src/mesa/main/bufferobj.h4
-rw-r--r--src/mesa/main/tests/dispatch_sanity.cpp1
4 files changed, 34 insertions, 0 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 8bcbb08f49c..641e68f71f0 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -104,6 +104,13 @@
<param name="params" type="GLvoid **" />
</function>
+ <function name="GetNamedBufferSubData" offset="assign">
+ <param name="buffer" type="GLuint" />
+ <param name="offset" type="GLintptr" />
+ <param name="size" type="GLsizeiptr" />
+ <param name="data" type="GLvoid *" />
+ </function>
+
<!-- Texture object functions -->
<function name="CreateTextures" offset="assign">
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 49d6d329e6b..7aac1c62f65 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1700,6 +1700,28 @@ _mesa_GetBufferSubData(GLenum target, GLintptr offset,
ctx->Driver.GetBufferSubData( ctx, offset, size, data, bufObj );
}
+void GLAPIENTRY
+_mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
+ GLsizeiptr size, GLvoid *data)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_buffer_object *bufObj;
+
+ bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
+ "glGetNamedBufferSubData");
+ if (!bufObj)
+ return;
+
+ if (!buffer_object_subdata_range_good(ctx, bufObj, offset, size, false,
+ "glGetNamedBufferSubData")) {
+ return;
+ }
+
+ assert(ctx->Driver.GetBufferSubData);
+ ctx->Driver.GetBufferSubData(ctx, offset, size, data, bufObj);
+}
+
+
/**
* \param subdata true if caller is *SubData, false if *Data
*/
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index eee04fe86e9..feeaa8b058e 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -234,6 +234,10 @@ _mesa_GetBufferSubData(GLenum target, GLintptrARB offset,
GLsizeiptrARB size, void * data);
void GLAPIENTRY
+_mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
+ GLsizeiptr size, GLvoid *data);
+
+void GLAPIENTRY
_mesa_ClearBufferData(GLenum target, GLenum internalformat,
GLenum format, GLenum type,
const GLvoid *data);
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 01b73a6acca..5d849d4ddb0 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -967,6 +967,7 @@ const struct function gl_core_functions_possible[] = {
{ "glGetNamedBufferParameteriv", 45, -1 },
{ "glGetNamedBufferParameteri64v", 45, -1 },
{ "glGetNamedBufferPointerv", 45, -1 },
+ { "glGetNamedBufferSubData", 45, -1 },
{ "glCreateTextures", 45, -1 },
{ "glTextureStorage1D", 45, -1 },
{ "glTextureStorage2D", 45, -1 },