From 5894ec5a66b9131c06f6caefd8ec0b267ad9eea3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 11 Nov 2013 19:12:35 -0800 Subject: [PATCH] Add dispatch for glGetQueryiv(). We need it for fixing timestamp subtraction. --- fips-dispatch-gl.c | 12 ++++++++++++ fips-dispatch-gl.h | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/fips-dispatch-gl.c b/fips-dispatch-gl.c index 368a9e7..0f5c251 100644 --- a/fips-dispatch-gl.c +++ b/fips-dispatch-gl.c @@ -196,6 +196,18 @@ stub_glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 * params) PFNGLGETQUERYOBJECTUI64VPROC fips_dispatch_glGetQueryObjectui64v = stub_glGetQueryObjectui64v; +static void +stub_glGetQueryiv (GLenum target, GLenum pname, GLint * params) +{ + check_initialized (); + resolve2 (fips_dispatch_glGetQueryiv, + "glGetQueryiv", "glGetQueryivARB"); + fips_dispatch_glGetQueryiv (target, pname, params); +} + +PFNGLGETQUERYOBJECTIVPROC fips_dispatch_glGetQueryiv = + stub_glGetQueryiv; + static void stub_glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups) diff --git a/fips-dispatch-gl.h b/fips-dispatch-gl.h index a85dcaf..7b354c8 100644 --- a/fips-dispatch-gl.h +++ b/fips-dispatch-gl.h @@ -94,6 +94,7 @@ typedef void (*PFNGLGETQUERYOBJECTUIVPROC)(GLuint, GLenum, GLuint *); typedef void (*PFNGLGETQUERYOBJECTI64VPROC)(GLuint, GLenum, GLint64 *); typedef void (*PFNGLGETQUERYOBJECTUI64VPROC)(GLuint, GLenum, GLuint64 *); +typedef void (*PFNGLGETQUERYIVPROC)(GLenum, GLenum, GLint *); typedef void (*PFNGLGETPERFMONITORGROUPSAMDPROC)(GLint *, GLsizei, GLuint *); typedef void (*PFNGLGETPERFMONITORCOUNTERSAMDPROC)(GLuint, GLint *, GLint *, GLsizei, GLuint *); @@ -156,6 +157,10 @@ extern PFNGLGETQUERYOBJECTI64VPROC fips_dispatch_glGetQueryObjecti64v; extern PFNGLGETQUERYOBJECTUI64VPROC fips_dispatch_glGetQueryObjectui64v; #define glGetQueryObjectui64v fips_dispatch_glGetQueryObjectui64v +extern PFNGLGETQUERYIVPROC fips_dispatch_glGetQueryiv; +#define glGetQueryiv fips_dispatch_glGetQueryiv + +#define GL_QUERY_COUNTER_BITS 0x8864 #define GL_COUNTER_TYPE_AMD 0x8BC0 #define GL_COUNTER_RANGE_AMD 0x8BC1 #define GL_UNSIGNED_INT64_AMD 0x8BC2 -- 2.43.0