Added support for EXT_disjoint_timer_query

This commit is contained in:
Jimmy Lee
2017-05-29 05:15:47 -07:00
committed by Baldur Karlsson
parent 1426d1bbd9
commit db5b0e47fe
3 changed files with 19 additions and 9 deletions
+1
View File
@@ -752,6 +752,7 @@ void WrappedOpenGL::BuildGLESExtensions()
m_GLESExtensions.push_back("GL_OES_primitive_bounding_box");
m_GLESExtensions.push_back("GL_EXT_copy_image");
m_GLESExtensions.push_back("GL_EXT_disjoint_timer_query");
m_GLESExtensions.push_back("GL_EXT_draw_buffers");
m_GLESExtensions.push_back("GL_EXT_draw_buffers_indexed");
m_GLESExtensions.push_back("GL_EXT_geometry_point_size");
+9 -9
View File
@@ -173,10 +173,10 @@ struct GLHookSet
PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv;
PFNGLGETQUERYINDEXEDIVPROC glGetQueryIndexediv;
PFNGLGETQUERYOBJECTUI64VPROC glGetQueryObjectui64v; // aliases glGetQueryObjectui64vEXT
PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv; // aliases glGetQueryObjectuivARB
PFNGLGETQUERYOBJECTI64VPROC glGetQueryObjecti64v; // aliases glGetQueryObjecti64vEXT
PFNGLGETQUERYOBJECTIVPROC glGetQueryObjectiv; // aliases glGetQueryObjectivARB
PFNGLGETQUERYIVPROC glGetQueryiv; // aliases glGetQueryivARB
PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv; // aliases glGetQueryObjectuivARB, glGetQueryObjectuivEXT
PFNGLGETQUERYOBJECTI64VPROC glGetQueryObjecti64v; // aliases glGetQueryObjecti64vEXT, glGetQueryObjecti64vEXT
PFNGLGETQUERYOBJECTIVPROC glGetQueryObjectiv; // aliases glGetQueryObjectivARB, glGetQueryObjectivEXT
PFNGLGETQUERYIVPROC glGetQueryiv; // aliases glGetQueryivARB, glGetQueryivEXT
PFNGLGETSYNCIVPROC glGetSynciv;
PFNGLGETBUFFERSUBDATAPROC glGetBufferSubData; // aliases glGetBufferSubDataARB
PFNGLGETVERTEXATTRIBIVPROC glGetVertexAttribiv;
@@ -312,15 +312,15 @@ struct GLHookSet
PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
PFNGLWAITSYNCPROC glWaitSync;
PFNGLDELETESYNCPROC glDeleteSync;
PFNGLGENQUERIESPROC glGenQueries; // aliases glGenQueriesARB
PFNGLBEGINQUERYPROC glBeginQuery; // aliases glBeginQueryARB
PFNGLGENQUERIESPROC glGenQueries; // aliases glGenQueriesARB, glGenQueriesEXT
PFNGLBEGINQUERYPROC glBeginQuery; // aliases glBeginQueryARB, glBeginQueryEXT
PFNGLBEGINQUERYINDEXEDPROC glBeginQueryIndexed;
PFNGLENDQUERYPROC glEndQuery; // aliases glEndQueryARB
PFNGLENDQUERYPROC glEndQuery; // aliases glEndQueryARB, glEndQueryEXT
PFNGLENDQUERYINDEXEDPROC glEndQueryIndexed;
PFNGLBEGINCONDITIONALRENDERPROC glBeginConditionalRender;
PFNGLENDCONDITIONALRENDERPROC glEndConditionalRender;
PFNGLQUERYCOUNTERPROC glQueryCounter;
PFNGLDELETEQUERIESPROC glDeleteQueries; // aliases glDeleteQueriesARB
PFNGLQUERYCOUNTERPROC glQueryCounter; // aliases glQueryCounterEXT
PFNGLDELETEQUERIESPROC glDeleteQueries; // aliases glDeleteQueriesARB, glDeleteQueriesEXT
PFNGLBUFFERDATAPROC glBufferData; // aliases glBufferDataARB
PFNGLBUFFERSTORAGEPROC glBufferStorage;
PFNGLBUFFERSUBDATAPROC glBufferSubData; // aliases glBufferSubDataARB
+9
View File
@@ -145,20 +145,28 @@
HookExtensionAlias(PFNGLBLENDEQUATIONPROC, glBlendEquation, glBlendEquationEXT); \
HookExtension(PFNGLGENQUERIESPROC, glGenQueries); \
HookExtensionAlias(PFNGLGENQUERIESPROC, glGenQueries, glGenQueriesARB); \
HookExtensionAlias(PFNGLGENQUERIESPROC, glGenQueries, glGenQueriesEXT); \
HookExtension(PFNGLDELETEQUERIESPROC, glDeleteQueries); \
HookExtensionAlias(PFNGLDELETEQUERIESPROC, glDeleteQueries, glDeleteQueriesARB); \
HookExtensionAlias(PFNGLDELETEQUERIESPROC, glDeleteQueries, glDeleteQueriesEXT); \
HookExtension(PFNGLISQUERYPROC, glIsQuery); \
HookExtensionAlias(PFNGLISQUERYPROC, glIsQuery, glIsQueryARB); \
HookExtensionAlias(PFNGLISQUERYPROC, glIsQuery, glIsQueryEXT); \
HookExtension(PFNGLBEGINQUERYPROC, glBeginQuery); \
HookExtensionAlias(PFNGLBEGINQUERYPROC, glBeginQuery, glBeginQueryARB); \
HookExtensionAlias(PFNGLBEGINQUERYPROC, glBeginQuery, glBeginQueryEXT); \
HookExtension(PFNGLENDQUERYPROC, glEndQuery); \
HookExtensionAlias(PFNGLENDQUERYPROC, glEndQuery, glEndQueryARB); \
HookExtensionAlias(PFNGLENDQUERYPROC, glEndQuery, glEndQueryEXT); \
HookExtension(PFNGLGETQUERYIVPROC, glGetQueryiv); \
HookExtensionAlias(PFNGLGETQUERYIVPROC, glGetQueryiv, glGetQueryivARB); \
HookExtensionAlias(PFNGLGETQUERYIVPROC, glGetQueryiv, glGetQueryivEXT); \
HookExtension(PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectiv); \
HookExtensionAlias(PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectiv, glGetQueryObjectivARB); \
HookExtensionAlias(PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectiv, glGetQueryObjectivEXT); \
HookExtension(PFNGLGETQUERYOBJECTUIVPROC, glGetQueryObjectuiv); \
HookExtensionAlias(PFNGLGETQUERYOBJECTUIVPROC, glGetQueryObjectuiv, glGetQueryObjectuivARB); \
HookExtensionAlias(PFNGLGETQUERYOBJECTUIVPROC, glGetQueryObjectuiv, glGetQueryObjectuivEXT); \
HookExtension(PFNGLBINDBUFFERPROC, glBindBuffer); \
HookExtensionAlias(PFNGLBINDBUFFERPROC, glBindBuffer, glBindBufferARB); \
HookExtension(PFNGLDELETEBUFFERSPROC, glDeleteBuffers); \
@@ -542,6 +550,7 @@
HookExtension(PFNGLGETSAMPLERPARAMETERFVPROC, glGetSamplerParameterfv); \
HookExtension(PFNGLGETSAMPLERPARAMETERIUIVPROC, glGetSamplerParameterIuiv); \
HookExtension(PFNGLQUERYCOUNTERPROC, glQueryCounter); \
HookExtensionAlias(PFNGLQUERYCOUNTERPROC, glQueryCounter, glQueryCounterEXT); \
HookExtension(PFNGLGETQUERYOBJECTI64VPROC, glGetQueryObjecti64v); \
HookExtensionAlias(PFNGLGETQUERYOBJECTI64VPROC, glGetQueryObjecti64v, glGetQueryObjecti64vEXT); \
HookExtension(PFNGLGETQUERYOBJECTUI64VPROC, glGetQueryObjectui64v); \