From a375d3093af5ac2710c5296fc8a92d34f27dcc00 Mon Sep 17 00:00:00 2001 From: Peter Gal Date: Thu, 4 May 2017 14:16:04 +0200 Subject: [PATCH] Add missing alias entries for GL_OES_mapbuffer extension In #598 the alias glMapBufferOES and glUnmapBufferOES macros were added for the gl_hookset_defs.h but the alias entries in the gl_hookset.h was missed. Also expose the glGetBufferPointervOES as part of the GL_OES_mapbuffer extension. --- renderdoc/driver/gl/gl_driver.cpp | 1 + renderdoc/driver/gl/gl_hookset.h | 6 +++--- renderdoc/driver/gl/gl_hookset_defs.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index 6a23515d2..e3b3226a6 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -733,6 +733,7 @@ void WrappedOpenGL::BuildGLESExtensions() m_GLESExtensions.push_back("GL_OES_gpu_shader5"); m_GLESExtensions.push_back("GL_OES_rgb8_rgba8"); + m_GLESExtensions.push_back("GL_OES_mapbuffer"); m_GLESExtensions.push_back("GL_OES_standard_derivatives"); m_GLESExtensions.push_back("GL_OES_texture_compression_astc"); m_GLESExtensions.push_back("GL_OES_texture_stencil8"); diff --git a/renderdoc/driver/gl/gl_hookset.h b/renderdoc/driver/gl/gl_hookset.h index 9a6fef1bf..3d6abd42e 100644 --- a/renderdoc/driver/gl/gl_hookset.h +++ b/renderdoc/driver/gl/gl_hookset.h @@ -135,7 +135,7 @@ struct GLHookSet PFNGLGETINTERNALFORMATI64VPROC glGetInternalformati64v; PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv; // aliases glGetBufferParameterivARB PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v; - PFNGLGETBUFFERPOINTERVPROC glGetBufferPointerv; // aliases glGetBufferPointervARB + PFNGLGETBUFFERPOINTERVPROC glGetBufferPointerv; // aliases glGetBufferPointervARB, glGetBufferPointervOES PFNGLGETFRAGDATAINDEXPROC glGetFragDataIndex; PFNGLGETFRAGDATALOCATIONPROC glGetFragDataLocation; // aliases glGetFragDataLocationEXT PFNGLGETSTRINGIPROC glGetStringi; @@ -329,10 +329,10 @@ struct GLHookSet PFNGLBINDBUFFERRANGEPROC glBindBufferRange; // aliases glBindBufferRangeEXT PFNGLBINDBUFFERSBASEPROC glBindBuffersBase; PFNGLBINDBUFFERSRANGEPROC glBindBuffersRange; - PFNGLMAPBUFFERPROC glMapBuffer; // aliases glMapBufferARB + PFNGLMAPBUFFERPROC glMapBuffer; // aliases glMapBufferARB, glMapBufferOES PFNGLMAPBUFFERRANGEPROC glMapBufferRange; PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange; - PFNGLUNMAPBUFFERPROC glUnmapBuffer; // aliases glUnmapBufferARB + PFNGLUNMAPBUFFERPROC glUnmapBuffer; // aliases glUnmapBufferARB, glUnmapBufferOES PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings; // aliases glTransformFeedbackVaryingsEXT PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks; PFNGLDELETETRANSFORMFEEDBACKSPROC glDeleteTransformFeedbacks; diff --git a/renderdoc/driver/gl/gl_hookset_defs.h b/renderdoc/driver/gl/gl_hookset_defs.h index 2951dfff5..70eec811d 100644 --- a/renderdoc/driver/gl/gl_hookset_defs.h +++ b/renderdoc/driver/gl/gl_hookset_defs.h @@ -183,6 +183,7 @@ HookExtensionAlias(PFNGLGETBUFFERPARAMETERIVPROC, glGetBufferParameteriv, glGetBufferParameterivARB); \ HookExtension(PFNGLGETBUFFERPOINTERVPROC, glGetBufferPointerv); \ HookExtensionAlias(PFNGLGETBUFFERPOINTERVPROC, glGetBufferPointerv, glGetBufferPointervARB); \ + HookExtensionAlias(PFNGLGETBUFFERPOINTERVPROC, glGetBufferPointerv, glGetBufferPointervOES); \ HookExtension(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate); \ HookExtensionAlias(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate, glBlendEquationSeparateARB); \ HookExtensionAlias(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate, glBlendEquationSeparateEXT); \