diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 27 | ||||
| -rw-r--r-- | src/mesa/main/queryobj.c | 39 | ||||
| -rw-r--r-- | src/mesa/main/queryobj.h | 12 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 4 |
4 files changed, 82 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 a6d991c950e..05b9f3fe06f 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -428,5 +428,32 @@ <param name="ids" type="GLuint *" /> </function> + <function name="GetQueryBufferObjectiv" offset="assign"> + <param name="id" type="GLuint" /> + <param name="buffer" type="GLuint" /> + <param name="pname" type="GLenum" /> + <param name="offset" type="GLintptr" /> + </function> + + <function name="GetQueryBufferObjectuiv" offset="assign"> + <param name="id" type="GLuint" /> + <param name="buffer" type="GLuint" /> + <param name="pname" type="GLenum" /> + <param name="offset" type="GLintptr" /> + </function> + + <function name="GetQueryBufferObjecti64v" offset="assign"> + <param name="id" type="GLuint" /> + <param name="buffer" type="GLuint" /> + <param name="pname" type="GLenum" /> + <param name="offset" type="GLintptr" /> + </function> + + <function name="GetQueryBufferObjectui64v" offset="assign"> + <param name="id" type="GLuint" /> + <param name="buffer" type="GLuint" /> + <param name="pname" type="GLenum" /> + <param name="offset" type="GLintptr" /> + </function> </category> </OpenGLAPI> diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 19350584a8c..fbccf3fe6f4 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -914,6 +914,45 @@ _mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params) } /** + * New with GL_ARB_query_buffer_object + */ +void GLAPIENTRY +_mesa_GetQueryBufferObjectiv(GLuint id, GLuint buffer, GLenum pname, + GLintptr offset) +{ + GET_CURRENT_CONTEXT(ctx); + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetQueryBufferObjectiv"); +} + + +void GLAPIENTRY +_mesa_GetQueryBufferObjectuiv(GLuint id, GLuint buffer, GLenum pname, + GLintptr offset) +{ + GET_CURRENT_CONTEXT(ctx); + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetQueryBufferObjectuiv"); +} + + +void GLAPIENTRY +_mesa_GetQueryBufferObjecti64v(GLuint id, GLuint buffer, GLenum pname, + GLintptr offset) +{ + GET_CURRENT_CONTEXT(ctx); + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetQueryBufferObjecti64v"); +} + + +void GLAPIENTRY +_mesa_GetQueryBufferObjectui64v(GLuint id, GLuint buffer, GLenum pname, + GLintptr offset) +{ + GET_CURRENT_CONTEXT(ctx); + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetQueryBufferObjectui64v"); +} + + +/** * Allocate/init the context state related to query objects. */ void diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h index 431d4204fee..d1036fcce3d 100644 --- a/src/mesa/main/queryobj.h +++ b/src/mesa/main/queryobj.h @@ -79,5 +79,17 @@ void GLAPIENTRY _mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params); void GLAPIENTRY _mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params); +void GLAPIENTRY +_mesa_GetQueryBufferObjectiv(GLuint id, GLuint buffer, GLenum pname, + GLintptr offset); +void GLAPIENTRY +_mesa_GetQueryBufferObjectuiv(GLuint id, GLuint buffer, GLenum pname, + GLintptr offset); +void GLAPIENTRY +_mesa_GetQueryBufferObjecti64v(GLuint id, GLuint buffer, GLenum pname, + GLintptr offset); +void GLAPIENTRY +_mesa_GetQueryBufferObjectui64v(GLuint id, GLuint buffer, GLenum pname, + GLintptr offset); #endif /* QUERYOBJ_H */ diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index e5362fb2679..c6dd50ba40a 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -977,6 +977,10 @@ const struct function gl_core_functions_possible[] = { { "glTextureBuffer", 45, -1 }, { "glTextureBufferRange", 45, -1 }, { "glCreateQueries", 45, -1 }, + { "glGetQueryBufferObjectiv", 45, -1 }, + { "glGetQueryBufferObjectuiv", 45, -1 }, + { "glGetQueryBufferObjecti64v", 45, -1 }, + { "glGetQueryBufferObjectui64v", 45, -1 }, /* GL_EXT_polygon_offset_clamp */ { "glPolygonOffsetClampEXT", 11, -1 }, |