From 9da77952e26d212436923115d2377e71d161c8ac Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 20 Dec 2014 14:05:50 +0000 Subject: [PATCH] Add some EXT aliases and then report more supported EXT extensions --- renderdoc/driver/gl/gl_driver.cpp | 45 +++++- renderdoc/driver/gl/gl_hookset.h | 142 ++++++++--------- renderdoc/driver/gl/gl_hookset_defs.h | 209 +++++++++----------------- 3 files changed, 183 insertions(+), 213 deletions(-) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index 296d12181..6f19d6a1c 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -335,7 +335,7 @@ WrappedOpenGL::WrappedOpenGL(const char *logfile, const GLHookSet &funcs) { if(RenderDoc::Inst().GetCrashHandler()) RenderDoc::Inst().GetCrashHandler()->RegisterMemoryRegion(this, sizeof(WrappedOpenGL)); - + globalExts.push_back("GL_ARB_arrays_of_arrays"); globalExts.push_back("GL_ARB_base_instance"); globalExts.push_back("GL_ARB_blend_func_extended"); @@ -368,8 +368,8 @@ WrappedOpenGL::WrappedOpenGL(const char *logfile, const GLHookSet &funcs) globalExts.push_back("GL_ARB_framebuffer_no_attachments"); globalExts.push_back("GL_ARB_framebuffer_object"); globalExts.push_back("GL_ARB_framebuffer_sRGB"); - globalExts.push_back("GL_ARB_get_program_binary"); globalExts.push_back("GL_ARB_geometry_shader4"); + globalExts.push_back("GL_ARB_get_program_binary"); globalExts.push_back("GL_ARB_gpu_shader_fp64"); globalExts.push_back("GL_ARB_gpu_shader5"); globalExts.push_back("GL_ARB_half_float_pixel"); @@ -454,22 +454,59 @@ WrappedOpenGL::WrappedOpenGL(const char *logfile, const GLHookSet &funcs) globalExts.push_back("GL_ARB_vertex_type_10f_11f_11f_rev"); globalExts.push_back("GL_ARB_vertex_type_2_10_10_10_rev"); globalExts.push_back("GL_ARB_viewport_array"); + globalExts.push_back("GL_EXT_bgra"); + globalExts.push_back("GL_EXT_blend_color"); + globalExts.push_back("GL_EXT_blend_equation_separate"); + globalExts.push_back("GL_EXT_blend_func_separate"); + globalExts.push_back("GL_EXT_blend_minmax"); + globalExts.push_back("GL_EXT_blend_subtract"); globalExts.push_back("GL_EXT_depth_bounds_test"); globalExts.push_back("GL_EXT_direct_state_access"); + globalExts.push_back("GL_EXT_draw_buffers2"); + globalExts.push_back("GL_EXT_draw_instanced"); + globalExts.push_back("GL_EXT_draw_range_elements"); globalExts.push_back("GL_EXT_framebuffer_blit"); + globalExts.push_back("GL_EXT_framebuffer_multisample"); + globalExts.push_back("GL_EXT_framebuffer_multisample_blit_scaled"); globalExts.push_back("GL_EXT_framebuffer_object"); + globalExts.push_back("GL_EXT_framebuffer_sRGB"); + globalExts.push_back("GL_EXT_gpu_shader4"); + globalExts.push_back("GL_EXT_multi_draw_arrays"); + globalExts.push_back("GL_EXT_packed_depth_stencil"); + globalExts.push_back("GL_EXT_packed_float"); globalExts.push_back("GL_EXT_pixel_buffer_object"); + globalExts.push_back("GL_EXT_pixel_buffer_object"); + globalExts.push_back("GL_EXT_point_parameters"); globalExts.push_back("GL_EXT_polygon_offset_clamp"); + globalExts.push_back("GL_EXT_provoking_vertex"); + globalExts.push_back("GL_EXT_shader_image_load_store"); + globalExts.push_back("GL_EXT_shader_integer_mix"); + globalExts.push_back("GL_EXT_shadow_funcs"); + globalExts.push_back("GL_EXT_stencil_wrap"); + globalExts.push_back("GL_EXT_texture_array"); + globalExts.push_back("GL_EXT_texture_buffer_object"); + globalExts.push_back("GL_EXT_texture_compression_dxt1"); + globalExts.push_back("GL_EXT_texture_compression_rgtc"); globalExts.push_back("GL_EXT_texture_compression_s3tc"); + globalExts.push_back("GL_EXT_texture_cube_map"); + globalExts.push_back("GL_EXT_texture_edge_clamp"); globalExts.push_back("GL_EXT_texture_filter_anisotropic"); + globalExts.push_back("GL_EXT_texture_integer"); + globalExts.push_back("GL_EXT_texture_lod_bias"); globalExts.push_back("GL_EXT_texture_mirror_clamp"); + globalExts.push_back("GL_EXT_texture_shared_exponent"); + globalExts.push_back("GL_EXT_texture_sRGB"); globalExts.push_back("GL_EXT_texture_sRGB_decode"); + globalExts.push_back("GL_EXT_texture_swizzle"); + globalExts.push_back("GL_EXT_texture3D"); globalExts.push_back("GL_EXT_timer_query"); - globalExts.push_back("GL_GREMEDY_string_marker"); + globalExts.push_back("GL_EXT_transform_feedback"); + globalExts.push_back("GL_EXT_vertex_attrib_64bit"); globalExts.push_back("GL_GREMEDY_frame_terminator"); - globalExts.push_back("GL_KHR_debug"); + globalExts.push_back("GL_GREMEDY_string_marker"); globalExts.push_back("GL_KHR_blend_equation_advanced"); globalExts.push_back("GL_KHR_blend_equation_advanced_coherent"); + globalExts.push_back("GL_KHR_debug"); // we'll be sorting the implementation extension array, so make sure the // sorts are identical so we can do the intersection easily diff --git a/renderdoc/driver/gl/gl_hookset.h b/renderdoc/driver/gl/gl_hookset.h index ca8df05cc..9afb2f9f3 100644 --- a/renderdoc/driver/gl/gl_hookset.h +++ b/renderdoc/driver/gl/gl_hookset.h @@ -101,9 +101,9 @@ struct GLHookSet PFNGLTEXSTORAGE3DPROC glTexStorage3D; PFNGLTEXSTORAGE2DMULTISAMPLEPROC glTexStorage2DMultisample; PFNGLTEXSTORAGE3DMULTISAMPLEPROC glTexStorage3DMultisample; - PFNGLTEXIMAGE3DPROC glTexImage3D; + PFNGLTEXIMAGE3DPROC glTexImage3D; // aliases glTexImage3DEXT PFNGLTEXSUBIMAGE3DPROC glTexSubImage3D; - PFNGLTEXBUFFERPROC glTexBuffer; // aliases glTexBufferARB + PFNGLTEXBUFFERPROC glTexBuffer; // aliases glTexBufferARB, glTexBufferEXT PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample; PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample; PFNGLCOMPRESSEDTEXIMAGE1DPROC glCompressedTexImage1D; // aliases glCompressedTexImage1DARB @@ -114,8 +114,8 @@ struct GLHookSet PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glCompressedTexSubImage3D; // aliases glCompressedTexSubImage3DARB PFNGLTEXBUFFERRANGEPROC glTexBufferRange; PFNGLTEXTUREVIEWPROC glTextureView; - PFNGLTEXPARAMETERIIVPROC glTexParameterIiv; - PFNGLTEXPARAMETERIUIVPROC glTexParameterIuiv; + PFNGLTEXPARAMETERIIVPROC glTexParameterIiv; // aliases glTexParameterIivEXT + PFNGLTEXPARAMETERIUIVPROC glTexParameterIuiv; // aliases glTexParameterIuivEXT PFNGLGENERATEMIPMAPPROC glGenerateMipmap; // aliases glGenerateMipmapEXT PFNGLCOPYIMAGESUBDATAPROC glCopyImageSubData; PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D; @@ -125,7 +125,7 @@ struct GLHookSet PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v; PFNGLGETBUFFERPOINTERVPROC glGetBufferPointerv; // aliases glGetBufferPointervARB PFNGLGETFRAGDATAINDEXPROC glGetFragDataIndex; - PFNGLGETFRAGDATALOCATIONPROC glGetFragDataLocation; + PFNGLGETFRAGDATALOCATIONPROC glGetFragDataLocation; // aliases glGetFragDataLocationEXT PFNGLGETSTRINGIPROC glGetStringi; PFNGLGETBOOLEANI_VPROC glGetBooleani_v; PFNGLGETINTEGERI_VPROC glGetIntegeri_v; @@ -181,15 +181,15 @@ struct GLHookSet PFNGLGETTEXTUREPARAMETERFVPROC glGetTextureParameterfv; PFNGLGETTEXTUREPARAMETERIVPROC glGetTextureParameteriv; PFNGLGETTEXTURESUBIMAGEPROC glGetTextureSubImage; - PFNGLGETTEXPARAMETERIIVPROC glGetTexParameterIiv; - PFNGLGETTEXPARAMETERIUIVPROC glGetTexParameterIuiv; + PFNGLGETTEXPARAMETERIIVPROC glGetTexParameterIiv; // aliases glGetTexParameterIivEXT + PFNGLGETTEXPARAMETERIUIVPROC glGetTexParameterIuiv; // aliases glGetTexParameterIuivEXT PFNGLCLAMPCOLORPROC glClampColor; // aliases glClampColorARB PFNGLREADNPIXELSPROC glReadnPixels; // aliases glReadnPixelsARB PFNGLGETSAMPLERPARAMETERIIVPROC glGetSamplerParameterIiv; PFNGLGETSAMPLERPARAMETERIUIVPROC glGetSamplerParameterIuiv; PFNGLGETSAMPLERPARAMETERFVPROC glGetSamplerParameterfv; PFNGLGETSAMPLERPARAMETERIVPROC glGetSamplerParameteriv; - PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glGetTransformFeedbackVarying; + PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glGetTransformFeedbackVarying; // aliases glGetTransformFeedbackVaryingEXT PFNGLGETTRANSFORMFEEDBACKI64_VPROC glGetTransformFeedbacki64_v; PFNGLGETTRANSFORMFEEDBACKI_VPROC glGetTransformFeedbacki_v; PFNGLGETTRANSFORMFEEDBACKIVPROC glGetTransformFeedbackiv; @@ -212,7 +212,7 @@ struct GLHookSet PFNGLGETACTIVEATTRIBPROC glGetActiveAttrib; PFNGLGETUNIFORMFVPROC glGetUniformfv; PFNGLGETUNIFORMIVPROC glGetUniformiv; - PFNGLGETUNIFORMUIVPROC glGetUniformuiv; + PFNGLGETUNIFORMUIVPROC glGetUniformuiv; // aliases glGetUniformuivEXT PFNGLGETUNIFORMDVPROC glGetUniformdv; PFNGLGETNUNIFORMDVPROC glGetnUniformdv; // aliases glGetnUniformdvARB PFNGLGETNUNIFORMFVPROC glGetnUniformfv; // aliases glGetnUniformfvARB @@ -221,27 +221,27 @@ struct GLHookSet PFNGLGETVERTEXARRAYIVPROC glGetVertexArrayiv; PFNGLGETVERTEXARRAYINDEXED64IVPROC glGetVertexArrayIndexed64iv; PFNGLGETVERTEXARRAYINDEXEDIVPROC glGetVertexArrayIndexediv; - PFNGLGETVERTEXATTRIBIIVPROC glGetVertexAttribIiv; - PFNGLGETVERTEXATTRIBIUIVPROC glGetVertexAttribIuiv; - PFNGLGETVERTEXATTRIBLDVPROC glGetVertexAttribLdv; + PFNGLGETVERTEXATTRIBIIVPROC glGetVertexAttribIiv; // aliases glGetVertexAttribIivEXT + PFNGLGETVERTEXATTRIBIUIVPROC glGetVertexAttribIuiv; // aliases glGetVertexAttribIuivEXT + PFNGLGETVERTEXATTRIBLDVPROC glGetVertexAttribLdv; // aliases glGetVertexAttribLdvEXT PFNGLGETVERTEXATTRIBDVPROC glGetVertexAttribdv; PFNGLGETVERTEXATTRIBFVPROC glGetVertexAttribfv; PFNGLGETNAMEDBUFFERPARAMETERI64VPROC glGetNamedBufferParameteri64v; PFNGLGETNAMEDBUFFERPOINTERVPROC glGetNamedBufferPointerv; PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus; // aliases glCheckFramebufferStatusEXT - PFNGLBLENDCOLORPROC glBlendColor; + PFNGLBLENDCOLORPROC glBlendColor; // aliases glBlendColorEXT PFNGLBLENDFUNCIPROC glBlendFunci; // aliases glBlendFunciARB PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate; // aliases glBlendFuncSeparateARB PFNGLBLENDFUNCSEPARATEIPROC glBlendFuncSeparatei; // aliases glBlendFuncSeparateiARB - PFNGLBLENDEQUATIONPROC glBlendEquation; + PFNGLBLENDEQUATIONPROC glBlendEquation; // aliases glBlendEquationEXT PFNGLBLENDEQUATIONIPROC glBlendEquationi; // aliases glBlendEquationiARB - PFNGLBLENDEQUATIONSEPARATEPROC glBlendEquationSeparate; // aliases glBlendEquationSeparateARB + PFNGLBLENDEQUATIONSEPARATEPROC glBlendEquationSeparate; // aliases glBlendEquationSeparateARB, glBlendEquationSeparateEXT PFNGLBLENDEQUATIONSEPARATEIPROC glBlendEquationSeparatei; // aliases glBlendEquationSeparateiARB PFNGLBLENDBARRIERKHRPROC glBlendBarrierKHR; PFNGLSTENCILFUNCSEPARATEPROC glStencilFuncSeparate; PFNGLSTENCILMASKSEPARATEPROC glStencilMaskSeparate; PFNGLSTENCILOPSEPARATEPROC glStencilOpSeparate; - PFNGLCOLORMASKIPROC glColorMaski; + PFNGLCOLORMASKIPROC glColorMaski; // aliases glColorMaskIndexedEXT PFNGLSAMPLEMASKIPROC glSampleMaski; PFNGLSAMPLECOVERAGEPROC glSampleCoverage; // aliases glSampleCoverageARB PFNGLMINSAMPLESHADINGPROC glMinSampleShading; // aliases glMinSampleShadingARB @@ -251,7 +251,7 @@ struct GLHookSet PFNGLDEPTHBOUNDSEXTPROC glDepthBoundsEXT; PFNGLPOLYGONOFFSETCLAMPEXTPROC glPolygonOffsetClampEXT; PFNGLCLIPCONTROLPROC glClipControl; - PFNGLPROVOKINGVERTEXPROC glProvokingVertex; + PFNGLPROVOKINGVERTEXPROC glProvokingVertex; // aliases glProvokingVertexEXT PFNGLPRIMITIVERESTARTINDEXPROC glPrimitiveRestartIndex; PFNGLCREATESHADERPROC glCreateShader; PFNGLDELETESHADERPROC glDeleteShader; @@ -306,12 +306,12 @@ struct GLHookSet PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D; // aliases glFramebufferTexture2DEXT PFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D; // aliases glFramebufferTexture3DEXT PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer; // aliases glFramebufferRenderbufferEXT - PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer; // aliases glFramebufferTextureLayerARB + PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer; // aliases glFramebufferTextureLayerARB, glFramebufferTextureLayerEXT PFNGLFRAMEBUFFERPARAMETERIPROC glFramebufferParameteri; PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; // aliases glDeleteFramebuffersEXT PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers; // aliases glGenRenderbuffersEXT PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage; // aliases glRenderbufferStorageEXT - PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample; + PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample; // aliases glRenderbufferStorageMultisampleEXT PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers; // aliases glDeleteRenderbuffersEXT PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; // aliases glBindRenderbufferEXT PFNGLFENCESYNCPROC glFenceSync; @@ -331,22 +331,22 @@ struct GLHookSet PFNGLBUFFERSTORAGEPROC glBufferStorage; PFNGLBUFFERSUBDATAPROC glBufferSubData; // aliases glBufferSubDataARB PFNGLCOPYBUFFERSUBDATAPROC glCopyBufferSubData; - PFNGLBINDBUFFERBASEPROC glBindBufferBase; - PFNGLBINDBUFFERRANGEPROC glBindBufferRange; + PFNGLBINDBUFFERBASEPROC glBindBufferBase; // aliases glBindBufferBaseEXT + PFNGLBINDBUFFERRANGEPROC glBindBufferRange; // aliases glBindBufferRangeEXT PFNGLBINDBUFFERSBASEPROC glBindBuffersBase; PFNGLBINDBUFFERSRANGEPROC glBindBuffersRange; PFNGLMAPBUFFERPROC glMapBuffer; // aliases glMapBufferARB PFNGLMAPBUFFERRANGEPROC glMapBufferRange; PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange; PFNGLUNMAPBUFFERPROC glUnmapBuffer; // aliases glUnmapBufferARB - PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings; + PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings; // aliases glTransformFeedbackVaryingsEXT PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks; PFNGLDELETETRANSFORMFEEDBACKSPROC glDeleteTransformFeedbacks; PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback; - PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback; + PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback; // aliases glBeginTransformFeedbackEXT PFNGLPAUSETRANSFORMFEEDBACKPROC glPauseTransformFeedback; PFNGLRESUMETRANSFORMFEEDBACKPROC glResumeTransformFeedback; - PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback; + PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback; // aliases glEndTransformFeedbackEXT PFNGLDRAWTRANSFORMFEEDBACKPROC glDrawTransformFeedback; PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC glDrawTransformFeedbackInstanced; PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC glDrawTransformFeedbackStream; @@ -391,34 +391,34 @@ struct GLHookSet PFNGLVERTEXATTRIB4UBVPROC glVertexAttrib4ubv; // aliases glVertexAttrib4ubvARB PFNGLVERTEXATTRIB4UIVPROC glVertexAttrib4uiv; // aliases glVertexAttrib4uivARB PFNGLVERTEXATTRIB4USVPROC glVertexAttrib4usv; // aliases glVertexAttrib4usvARB - PFNGLVERTEXATTRIBI1IPROC glVertexAttribI1i; - PFNGLVERTEXATTRIBI1IVPROC glVertexAttribI1iv; - PFNGLVERTEXATTRIBI1UIPROC glVertexAttribI1ui; - PFNGLVERTEXATTRIBI1UIVPROC glVertexAttribI1uiv; - PFNGLVERTEXATTRIBI2IPROC glVertexAttribI2i; - PFNGLVERTEXATTRIBI2IVPROC glVertexAttribI2iv; - PFNGLVERTEXATTRIBI2UIPROC glVertexAttribI2ui; - PFNGLVERTEXATTRIBI2UIVPROC glVertexAttribI2uiv; - PFNGLVERTEXATTRIBI3IPROC glVertexAttribI3i; - PFNGLVERTEXATTRIBI3IVPROC glVertexAttribI3iv; - PFNGLVERTEXATTRIBI3UIPROC glVertexAttribI3ui; - PFNGLVERTEXATTRIBI3UIVPROC glVertexAttribI3uiv; - PFNGLVERTEXATTRIBI4BVPROC glVertexAttribI4bv; - PFNGLVERTEXATTRIBI4IPROC glVertexAttribI4i; - PFNGLVERTEXATTRIBI4IVPROC glVertexAttribI4iv; - PFNGLVERTEXATTRIBI4SVPROC glVertexAttribI4sv; - PFNGLVERTEXATTRIBI4UBVPROC glVertexAttribI4ubv; - PFNGLVERTEXATTRIBI4UIPROC glVertexAttribI4ui; - PFNGLVERTEXATTRIBI4UIVPROC glVertexAttribI4uiv; - PFNGLVERTEXATTRIBI4USVPROC glVertexAttribI4usv; - PFNGLVERTEXATTRIBL1DPROC glVertexAttribL1d; - PFNGLVERTEXATTRIBL1DVPROC glVertexAttribL1dv; - PFNGLVERTEXATTRIBL2DPROC glVertexAttribL2d; - PFNGLVERTEXATTRIBL2DVPROC glVertexAttribL2dv; - PFNGLVERTEXATTRIBL3DPROC glVertexAttribL3d; - PFNGLVERTEXATTRIBL3DVPROC glVertexAttribL3dv; - PFNGLVERTEXATTRIBL4DPROC glVertexAttribL4d; - PFNGLVERTEXATTRIBL4DVPROC glVertexAttribL4dv; + PFNGLVERTEXATTRIBI1IPROC glVertexAttribI1i; // aliases glVertexAttribI1iEXT + PFNGLVERTEXATTRIBI1IVPROC glVertexAttribI1iv; // aliases glVertexAttribI1ivEXT + PFNGLVERTEXATTRIBI1UIPROC glVertexAttribI1ui; // aliases glVertexAttribI1uiEXT + PFNGLVERTEXATTRIBI1UIVPROC glVertexAttribI1uiv; // aliases glVertexAttribI1uivEXT + PFNGLVERTEXATTRIBI2IPROC glVertexAttribI2i; // aliases glVertexAttribI2iEXT + PFNGLVERTEXATTRIBI2IVPROC glVertexAttribI2iv; // aliases glVertexAttribI2ivEXT + PFNGLVERTEXATTRIBI2UIPROC glVertexAttribI2ui; // aliases glVertexAttribI2uiEXT + PFNGLVERTEXATTRIBI2UIVPROC glVertexAttribI2uiv; // aliases glVertexAttribI2uivEXT + PFNGLVERTEXATTRIBI3IPROC glVertexAttribI3i; // aliases glVertexAttribI3iEXT + PFNGLVERTEXATTRIBI3IVPROC glVertexAttribI3iv; // aliases glVertexAttribI3ivEXT + PFNGLVERTEXATTRIBI3UIPROC glVertexAttribI3ui; // aliases glVertexAttribI3uiEXT + PFNGLVERTEXATTRIBI3UIVPROC glVertexAttribI3uiv; // aliases glVertexAttribI3uivEXT + PFNGLVERTEXATTRIBI4BVPROC glVertexAttribI4bv; // aliases glVertexAttribI4bvEXT + PFNGLVERTEXATTRIBI4IPROC glVertexAttribI4i; // aliases glVertexAttribI4iEXT + PFNGLVERTEXATTRIBI4IVPROC glVertexAttribI4iv; // aliases glVertexAttribI4ivEXT + PFNGLVERTEXATTRIBI4SVPROC glVertexAttribI4sv; // aliases glVertexAttribI4svEXT + PFNGLVERTEXATTRIBI4UBVPROC glVertexAttribI4ubv; // aliases glVertexAttribI4ubvEXT + PFNGLVERTEXATTRIBI4UIPROC glVertexAttribI4ui; // aliases glVertexAttribI4uiEXT + PFNGLVERTEXATTRIBI4UIVPROC glVertexAttribI4uiv; // aliases glVertexAttribI4uivEXT + PFNGLVERTEXATTRIBI4USVPROC glVertexAttribI4usv; // aliases glVertexAttribI4usvEXT + PFNGLVERTEXATTRIBL1DPROC glVertexAttribL1d; // aliases glVertexAttribL1dEXT + PFNGLVERTEXATTRIBL1DVPROC glVertexAttribL1dv; // aliases glVertexAttribL1dvEXT + PFNGLVERTEXATTRIBL2DPROC glVertexAttribL2d; // aliases glVertexAttribL2dEXT + PFNGLVERTEXATTRIBL2DVPROC glVertexAttribL2dv; // aliases glVertexAttribL2dvEXT + PFNGLVERTEXATTRIBL3DPROC glVertexAttribL3d; // aliases glVertexAttribL3dEXT + PFNGLVERTEXATTRIBL3DVPROC glVertexAttribL3dv; // aliases glVertexAttribL3dvEXT + PFNGLVERTEXATTRIBL4DPROC glVertexAttribL4d; // aliases glVertexAttribL4dEXT + PFNGLVERTEXATTRIBL4DVPROC glVertexAttribL4dv; // aliases glVertexAttribL4dvEXT PFNGLVERTEXATTRIBP1UIPROC glVertexAttribP1ui; PFNGLVERTEXATTRIBP1UIVPROC glVertexAttribP1uiv; PFNGLVERTEXATTRIBP2UIPROC glVertexAttribP2ui; @@ -428,22 +428,22 @@ struct GLHookSet PFNGLVERTEXATTRIBP4UIPROC glVertexAttribP4ui; PFNGLVERTEXATTRIBP4UIVPROC glVertexAttribP4uiv; PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer; // aliases glVertexAttribPointerARB - PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer; - PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer; + PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer; // aliases glVertexAttribIPointerEXT + PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer; // aliases glVertexAttribLPointerEXT PFNGLVERTEXATTRIBBINDINGPROC glVertexAttribBinding; PFNGLVERTEXATTRIBFORMATPROC glVertexAttribFormat; PFNGLVERTEXATTRIBIFORMATPROC glVertexAttribIFormat; PFNGLVERTEXATTRIBLFORMATPROC glVertexAttribLFormat; PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor; // aliases glVertexAttribDivisorARB PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation; - PFNGLBINDFRAGDATALOCATIONPROC glBindFragDataLocation; + PFNGLBINDFRAGDATALOCATIONPROC glBindFragDataLocation; // aliases glBindFragDataLocationEXT PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glBindFragDataLocationIndexed; PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray; // aliases glEnableVertexAttribArrayARB PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray; // aliases glDisableVertexAttribArrayARB PFNGLBINDVERTEXBUFFERPROC glBindVertexBuffer; PFNGLBINDVERTEXBUFFERSPROC glBindVertexBuffers; PFNGLVERTEXBINDINGDIVISORPROC glVertexBindingDivisor; - PFNGLBINDIMAGETEXTUREPROC glBindImageTexture; + PFNGLBINDIMAGETEXTUREPROC glBindImageTexture; // aliases glBindImageTextureEXT PFNGLBINDIMAGETEXTURESPROC glBindImageTextures; PFNGLGENSAMPLERSPROC glGenSamplers; PFNGLBINDSAMPLERPROC glBindSampler; @@ -458,14 +458,14 @@ struct GLHookSet PFNGLSAMPLERPARAMETERIUIVPROC glSamplerParameterIuiv; PFNGLPATCHPARAMETERIPROC glPatchParameteri; PFNGLPATCHPARAMETERFVPROC glPatchParameterfv; - PFNGLPOINTPARAMETERFPROC glPointParameterf; // aliases glPointParameterfARB - PFNGLPOINTPARAMETERFVPROC glPointParameterfv; // aliases glPointParameterfvARB + PFNGLPOINTPARAMETERFPROC glPointParameterf; // aliases glPointParameterfARB, aliases glPointParameterfEXT + PFNGLPOINTPARAMETERFVPROC glPointParameterfv; // aliases glPointParameterfvARB, aliases glPointParameterfvEXT PFNGLPOINTPARAMETERIPROC glPointParameteri; PFNGLPOINTPARAMETERIVPROC glPointParameteriv; PFNGLDISPATCHCOMPUTEPROC glDispatchCompute; PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC glDispatchComputeGroupSizeARB; PFNGLDISPATCHCOMPUTEINDIRECTPROC glDispatchComputeIndirect; - PFNGLMEMORYBARRIERPROC glMemoryBarrier; + PFNGLMEMORYBARRIERPROC glMemoryBarrier; // aliases glMemoryBarrierEXT PFNGLMEMORYBARRIERBYREGIONPROC glMemoryBarrierByRegion; PFNGLTEXTUREBARRIERPROC glTextureBarrier; PFNGLCLEARDEPTHFPROC glClearDepthf; @@ -494,35 +494,35 @@ struct GLHookSet PFNGLUNIFORMSUBROUTINESUIVPROC glUniformSubroutinesuiv; PFNGLUNIFORM1FPROC glUniform1f; PFNGLUNIFORM1IPROC glUniform1i; - PFNGLUNIFORM1UIPROC glUniform1ui; + PFNGLUNIFORM1UIPROC glUniform1ui; // aliases glUniform1uiEXT PFNGLUNIFORM1DPROC glUniform1d; PFNGLUNIFORM2FPROC glUniform2f; PFNGLUNIFORM2IPROC glUniform2i; - PFNGLUNIFORM2UIPROC glUniform2ui; + PFNGLUNIFORM2UIPROC glUniform2ui; // aliases glUniform2uiEXT PFNGLUNIFORM2DPROC glUniform2d; PFNGLUNIFORM3FPROC glUniform3f; PFNGLUNIFORM3IPROC glUniform3i; - PFNGLUNIFORM3UIPROC glUniform3ui; + PFNGLUNIFORM3UIPROC glUniform3ui; // aliases glUniform3uiEXT PFNGLUNIFORM3DPROC glUniform3d; PFNGLUNIFORM4FPROC glUniform4f; PFNGLUNIFORM4IPROC glUniform4i; - PFNGLUNIFORM4UIPROC glUniform4ui; + PFNGLUNIFORM4UIPROC glUniform4ui; // aliases glUniform4uiEXT PFNGLUNIFORM4DPROC glUniform4d; PFNGLUNIFORM1FVPROC glUniform1fv; PFNGLUNIFORM1IVPROC glUniform1iv; - PFNGLUNIFORM1UIVPROC glUniform1uiv; + PFNGLUNIFORM1UIVPROC glUniform1uiv; // aliases glUniform1uivEXT PFNGLUNIFORM1DVPROC glUniform1dv; PFNGLUNIFORM2FVPROC glUniform2fv; PFNGLUNIFORM2IVPROC glUniform2iv; - PFNGLUNIFORM2UIVPROC glUniform2uiv; + PFNGLUNIFORM2UIVPROC glUniform2uiv; // aliases glUniform2uivEXT PFNGLUNIFORM2DVPROC glUniform2dv; PFNGLUNIFORM3FVPROC glUniform3fv; PFNGLUNIFORM3IVPROC glUniform3iv; - PFNGLUNIFORM3UIVPROC glUniform3uiv; + PFNGLUNIFORM3UIVPROC glUniform3uiv; // aliases glUniform3uivEXT PFNGLUNIFORM3DVPROC glUniform3dv; PFNGLUNIFORM4FVPROC glUniform4fv; PFNGLUNIFORM4IVPROC glUniform4iv; - PFNGLUNIFORM4UIVPROC glUniform4uiv; + PFNGLUNIFORM4UIVPROC glUniform4uiv; // aliases glUniform4uivEXT PFNGLUNIFORM4DVPROC glUniform4dv; PFNGLUNIFORMMATRIX2FVPROC glUniformMatrix2fv; PFNGLUNIFORMMATRIX2X3FVPROC glUniformMatrix2x3fv; @@ -592,16 +592,16 @@ struct GLHookSet PFNGLPROGRAMUNIFORMMATRIX4DVPROC glProgramUniformMatrix4dv; PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC glProgramUniformMatrix4x2dv; PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC glProgramUniformMatrix4x3dv; - PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; + PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; // aliases glDrawRangeElementsEXT PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glDrawRangeElementsBaseVertex; PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC glDrawArraysInstancedBaseInstance; - PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced; // aliases glDrawArraysInstancedARB - PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced; // aliases glDrawElementsInstancedARB + PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced; // aliases glDrawArraysInstancedARB, glDrawArraysInstancedEXT + PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced; // aliases glDrawElementsInstancedARB, glDrawElementsInstancedEXT PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC glDrawElementsInstancedBaseInstance; PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex; PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex; PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance; - PFNGLMULTIDRAWARRAYSPROC glMultiDrawArrays; + PFNGLMULTIDRAWARRAYSPROC glMultiDrawArrays; // aliases glMultiDrawArraysEXT PFNGLMULTIDRAWELEMENTSPROC glMultiDrawElements; PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glMultiDrawElementsBaseVertex; PFNGLMULTIDRAWARRAYSINDIRECTPROC glMultiDrawArraysIndirect; diff --git a/renderdoc/driver/gl/gl_hookset_defs.h b/renderdoc/driver/gl/gl_hookset_defs.h index c72457541..2a1d2f9cf 100644 --- a/renderdoc/driver/gl/gl_hookset_defs.h +++ b/renderdoc/driver/gl/gl_hookset_defs.h @@ -102,7 +102,9 @@ // gl extensions #define HookCheckGLExtensions() \ HookExtension(PFNGLDRAWRANGEELEMENTSPROC, glDrawRangeElements); \ + HookExtensionAlias(PFNGLDRAWRANGEELEMENTSPROC, glDrawRangeElements, glDrawRangeElementsEXT); \ HookExtension(PFNGLTEXIMAGE3DPROC, glTexImage3D); \ + HookExtensionAlias(PFNGLTEXIMAGE3DPROC, glTexImage3D, glTexImage3DEXT); \ HookExtension(PFNGLTEXSUBIMAGE3DPROC, glTexSubImage3D); \ HookExtension(PFNGLCOPYTEXSUBIMAGE3DPROC, glCopyTexSubImage3D); \ HookExtension(PFNGLACTIVETEXTUREPROC, glActiveTexture); \ @@ -126,15 +128,20 @@ HookExtension(PFNGLBLENDFUNCSEPARATEPROC, glBlendFuncSeparate); \ HookExtensionAlias(PFNGLBLENDFUNCSEPARATEPROC, glBlendFuncSeparate, glBlendFuncSeparateARB); \ HookExtension(PFNGLMULTIDRAWARRAYSPROC, glMultiDrawArrays); \ + HookExtensionAlias(PFNGLMULTIDRAWARRAYSPROC, glMultiDrawArrays, glMultiDrawArraysEXT); \ HookExtension(PFNGLMULTIDRAWELEMENTSPROC, glMultiDrawElements); \ HookExtension(PFNGLPOINTPARAMETERFPROC, glPointParameterf); \ HookExtensionAlias(PFNGLPOINTPARAMETERFPROC, glPointParameterf, glPointParameterfARB); \ + HookExtensionAlias(PFNGLPOINTPARAMETERFPROC, glPointParameterf, aliases glPointParameterfEXT); \ HookExtension(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv); \ HookExtensionAlias(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv, glPointParameterfvARB); \ + HookExtensionAlias(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv, aliases glPointParameterfvEXT); \ HookExtension(PFNGLPOINTPARAMETERIPROC, glPointParameteri); \ HookExtension(PFNGLPOINTPARAMETERIVPROC, glPointParameteriv); \ HookExtension(PFNGLBLENDCOLORPROC, glBlendColor); \ + HookExtensionAlias(PFNGLBLENDCOLORPROC, glBlendColor, glBlendColorEXT); \ HookExtension(PFNGLBLENDEQUATIONPROC, glBlendEquation); \ + HookExtensionAlias(PFNGLBLENDEQUATIONPROC, glBlendEquation, glBlendEquationEXT); \ HookExtension(PFNGLGENQUERIESPROC, glGenQueries); \ HookExtensionAlias(PFNGLGENQUERIESPROC, glGenQueries, glGenQueriesARB); \ HookExtension(PFNGLDELETEQUERIESPROC, glDeleteQueries); \ @@ -175,6 +182,7 @@ HookExtensionAlias(PFNGLGETBUFFERPOINTERVPROC, glGetBufferPointerv, glGetBufferPointervARB); \ HookExtension(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate); \ HookExtensionAlias(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate, glBlendEquationSeparateARB); \ + HookExtensionAlias(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate, glBlendEquationSeparateEXT); \ HookExtension(PFNGLDRAWBUFFERSPROC, glDrawBuffers); \ HookExtensionAlias(PFNGLDRAWBUFFERSPROC, glDrawBuffers, glDrawBuffersARB); \ HookExtension(PFNGLSTENCILOPSEPARATEPROC, glStencilOpSeparate); \ @@ -313,6 +321,7 @@ HookExtension(PFNGLUNIFORMMATRIX3X4FVPROC, glUniformMatrix3x4fv); \ HookExtension(PFNGLUNIFORMMATRIX4X3FVPROC, glUniformMatrix4x3fv); \ HookExtension(PFNGLCOLORMASKIPROC, glColorMaski); \ + HookExtensionAlias(PFNGLCOLORMASKIPROC, glColorMaski, glColorMaskIndexedEXT); \ HookExtension(PFNGLGETBOOLEANI_VPROC, glGetBooleani_v); \ HookExtension(PFNGLGETINTEGERI_VPROC, glGetIntegeri_v); \ HookExtension(PFNGLENABLEIPROC, glEnablei); \ @@ -322,53 +331,97 @@ HookExtension(PFNGLISENABLEDIPROC, glIsEnabledi); \ HookExtensionAlias(PFNGLISENABLEDIPROC, glIsEnabledi, glIsEnabledIndexedEXT); \ HookExtension(PFNGLBEGINTRANSFORMFEEDBACKPROC, glBeginTransformFeedback); \ + HookExtensionAlias(PFNGLBEGINTRANSFORMFEEDBACKPROC, glBeginTransformFeedback, glBeginTransformFeedbackEXT); \ HookExtension(PFNGLENDTRANSFORMFEEDBACKPROC, glEndTransformFeedback); \ + HookExtensionAlias(PFNGLENDTRANSFORMFEEDBACKPROC, glEndTransformFeedback, glEndTransformFeedbackEXT); \ HookExtension(PFNGLBINDBUFFERRANGEPROC, glBindBufferRange); \ + HookExtensionAlias(PFNGLBINDBUFFERRANGEPROC, glBindBufferRange, glBindBufferRangeEXT); \ HookExtension(PFNGLBINDBUFFERBASEPROC, glBindBufferBase); \ + HookExtensionAlias(PFNGLBINDBUFFERBASEPROC, glBindBufferBase, glBindBufferBaseEXT); \ HookExtension(PFNGLTRANSFORMFEEDBACKVARYINGSPROC, glTransformFeedbackVaryings); \ + HookExtensionAlias(PFNGLTRANSFORMFEEDBACKVARYINGSPROC, glTransformFeedbackVaryings, glTransformFeedbackVaryingsEXT); \ HookExtension(PFNGLGETTRANSFORMFEEDBACKVARYINGPROC, glGetTransformFeedbackVarying); \ + HookExtensionAlias(PFNGLGETTRANSFORMFEEDBACKVARYINGPROC, glGetTransformFeedbackVarying, glGetTransformFeedbackVaryingEXT); \ HookExtension(PFNGLCLAMPCOLORPROC, glClampColor); \ HookExtensionAlias(PFNGLCLAMPCOLORPROC, glClampColor, glClampColorARB); \ HookExtension(PFNGLBEGINCONDITIONALRENDERPROC, glBeginConditionalRender); \ HookExtension(PFNGLENDCONDITIONALRENDERPROC, glEndConditionalRender); \ HookExtension(PFNGLVERTEXATTRIBIPOINTERPROC, glVertexAttribIPointer); \ + HookExtensionAlias(PFNGLVERTEXATTRIBIPOINTERPROC, glVertexAttribIPointer, glVertexAttribIPointerEXT); \ HookExtension(PFNGLGETVERTEXATTRIBIIVPROC, glGetVertexAttribIiv); \ + HookExtensionAlias(PFNGLGETVERTEXATTRIBIIVPROC, glGetVertexAttribIiv, glGetVertexAttribIivEXT); \ HookExtension(PFNGLGETVERTEXATTRIBIUIVPROC, glGetVertexAttribIuiv); \ + HookExtensionAlias(PFNGLGETVERTEXATTRIBIUIVPROC, glGetVertexAttribIuiv, glGetVertexAttribIuivEXT); \ HookExtension(PFNGLVERTEXATTRIBI1IPROC, glVertexAttribI1i); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI1IPROC, glVertexAttribI1i, glVertexAttribI1iEXT); \ HookExtension(PFNGLVERTEXATTRIBI2IPROC, glVertexAttribI2i); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI2IPROC, glVertexAttribI2i, glVertexAttribI2iEXT); \ HookExtension(PFNGLVERTEXATTRIBI3IPROC, glVertexAttribI3i); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI3IPROC, glVertexAttribI3i, glVertexAttribI3iEXT); \ HookExtension(PFNGLVERTEXATTRIBI4IPROC, glVertexAttribI4i); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI4IPROC, glVertexAttribI4i, glVertexAttribI4iEXT); \ HookExtension(PFNGLVERTEXATTRIBI1UIPROC, glVertexAttribI1ui); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI1UIPROC, glVertexAttribI1ui, glVertexAttribI1uiEXT); \ HookExtension(PFNGLVERTEXATTRIBI2UIPROC, glVertexAttribI2ui); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI2UIPROC, glVertexAttribI2ui, glVertexAttribI2uiEXT); \ HookExtension(PFNGLVERTEXATTRIBI3UIPROC, glVertexAttribI3ui); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI3UIPROC, glVertexAttribI3ui, glVertexAttribI3uiEXT); \ HookExtension(PFNGLVERTEXATTRIBI4UIPROC, glVertexAttribI4ui); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI4UIPROC, glVertexAttribI4ui, glVertexAttribI4uiEXT); \ HookExtension(PFNGLVERTEXATTRIBI1IVPROC, glVertexAttribI1iv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI1IVPROC, glVertexAttribI1iv, glVertexAttribI1ivEXT); \ HookExtension(PFNGLVERTEXATTRIBI2IVPROC, glVertexAttribI2iv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI2IVPROC, glVertexAttribI2iv, glVertexAttribI2ivEXT); \ HookExtension(PFNGLVERTEXATTRIBI3IVPROC, glVertexAttribI3iv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI3IVPROC, glVertexAttribI3iv, glVertexAttribI3ivEXT); \ HookExtension(PFNGLVERTEXATTRIBI4IVPROC, glVertexAttribI4iv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI4IVPROC, glVertexAttribI4iv, glVertexAttribI4ivEXT); \ HookExtension(PFNGLVERTEXATTRIBI1UIVPROC, glVertexAttribI1uiv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI1UIVPROC, glVertexAttribI1uiv, glVertexAttribI1uivEXT); \ HookExtension(PFNGLVERTEXATTRIBI2UIVPROC, glVertexAttribI2uiv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI2UIVPROC, glVertexAttribI2uiv, glVertexAttribI2uivEXT); \ HookExtension(PFNGLVERTEXATTRIBI3UIVPROC, glVertexAttribI3uiv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI3UIVPROC, glVertexAttribI3uiv, glVertexAttribI3uivEXT); \ HookExtension(PFNGLVERTEXATTRIBI4UIVPROC, glVertexAttribI4uiv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI4UIVPROC, glVertexAttribI4uiv, glVertexAttribI4uivEXT); \ HookExtension(PFNGLVERTEXATTRIBI4BVPROC, glVertexAttribI4bv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI4BVPROC, glVertexAttribI4bv, glVertexAttribI4bvEXT); \ HookExtension(PFNGLVERTEXATTRIBI4SVPROC, glVertexAttribI4sv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI4SVPROC, glVertexAttribI4sv, glVertexAttribI4svEXT); \ HookExtension(PFNGLVERTEXATTRIBI4UBVPROC, glVertexAttribI4ubv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI4UBVPROC, glVertexAttribI4ubv, glVertexAttribI4ubvEXT); \ HookExtension(PFNGLVERTEXATTRIBI4USVPROC, glVertexAttribI4usv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBI4USVPROC, glVertexAttribI4usv, glVertexAttribI4usvEXT); \ HookExtension(PFNGLGETUNIFORMUIVPROC, glGetUniformuiv); \ + HookExtensionAlias(PFNGLGETUNIFORMUIVPROC, glGetUniformuiv, glGetUniformuivEXT); \ HookExtension(PFNGLBINDFRAGDATALOCATIONPROC, glBindFragDataLocation); \ + HookExtensionAlias(PFNGLBINDFRAGDATALOCATIONPROC, glBindFragDataLocation, glBindFragDataLocationEXT); \ HookExtension(PFNGLGETFRAGDATALOCATIONPROC, glGetFragDataLocation); \ + HookExtensionAlias(PFNGLGETFRAGDATALOCATIONPROC, glGetFragDataLocation, glGetFragDataLocationEXT); \ HookExtension(PFNGLUNIFORM1UIPROC, glUniform1ui); \ + HookExtensionAlias(PFNGLUNIFORM1UIPROC, glUniform1ui, glUniform1uiEXT); \ HookExtension(PFNGLUNIFORM2UIPROC, glUniform2ui); \ + HookExtensionAlias(PFNGLUNIFORM2UIPROC, glUniform2ui, glUniform2uiEXT); \ HookExtension(PFNGLUNIFORM3UIPROC, glUniform3ui); \ + HookExtensionAlias(PFNGLUNIFORM3UIPROC, glUniform3ui, glUniform3uiEXT); \ HookExtension(PFNGLUNIFORM4UIPROC, glUniform4ui); \ + HookExtensionAlias(PFNGLUNIFORM4UIPROC, glUniform4ui, glUniform4uiEXT); \ HookExtension(PFNGLUNIFORM1UIVPROC, glUniform1uiv); \ + HookExtensionAlias(PFNGLUNIFORM1UIVPROC, glUniform1uiv, glUniform1uivEXT); \ HookExtension(PFNGLUNIFORM2UIVPROC, glUniform2uiv); \ + HookExtensionAlias(PFNGLUNIFORM2UIVPROC, glUniform2uiv, glUniform2uivEXT); \ HookExtension(PFNGLUNIFORM3UIVPROC, glUniform3uiv); \ + HookExtensionAlias(PFNGLUNIFORM3UIVPROC, glUniform3uiv, glUniform3uivEXT); \ HookExtension(PFNGLUNIFORM4UIVPROC, glUniform4uiv); \ + HookExtensionAlias(PFNGLUNIFORM4UIVPROC, glUniform4uiv, glUniform4uivEXT); \ HookExtension(PFNGLTEXPARAMETERIIVPROC, glTexParameterIiv); \ + HookExtensionAlias(PFNGLTEXPARAMETERIIVPROC, glTexParameterIiv, glTexParameterIivEXT); \ HookExtension(PFNGLTEXPARAMETERIUIVPROC, glTexParameterIuiv); \ + HookExtensionAlias(PFNGLTEXPARAMETERIUIVPROC, glTexParameterIuiv, glTexParameterIuivEXT); \ HookExtension(PFNGLGETTEXPARAMETERIIVPROC, glGetTexParameterIiv); \ + HookExtensionAlias(PFNGLGETTEXPARAMETERIIVPROC, glGetTexParameterIiv, glGetTexParameterIivEXT); \ HookExtension(PFNGLGETTEXPARAMETERIUIVPROC, glGetTexParameterIuiv); \ + HookExtensionAlias(PFNGLGETTEXPARAMETERIUIVPROC, glGetTexParameterIuiv, glGetTexParameterIuivEXT); \ HookExtension(PFNGLCLEARBUFFERIVPROC, glClearBufferiv); \ HookExtension(PFNGLCLEARBUFFERUIVPROC, glClearBufferuiv); \ HookExtension(PFNGLCLEARBUFFERFVPROC, glClearBufferfv); \ @@ -411,8 +464,10 @@ HookExtension(PFNGLBLITFRAMEBUFFERPROC, glBlitFramebuffer); \ HookExtensionAlias(PFNGLBLITFRAMEBUFFERPROC, glBlitFramebuffer, glBlitFramebufferEXT); \ HookExtension(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC, glRenderbufferStorageMultisample); \ + HookExtensionAlias(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC, glRenderbufferStorageMultisample, glRenderbufferStorageMultisampleEXT); \ HookExtension(PFNGLFRAMEBUFFERTEXTURELAYERPROC, glFramebufferTextureLayer); \ HookExtensionAlias(PFNGLFRAMEBUFFERTEXTURELAYERPROC, glFramebufferTextureLayer, glFramebufferTextureLayerARB); \ + HookExtensionAlias(PFNGLFRAMEBUFFERTEXTURELAYERPROC, glFramebufferTextureLayer, glFramebufferTextureLayerEXT); \ HookExtension(PFNGLMAPBUFFERRANGEPROC, glMapBufferRange); \ HookExtension(PFNGLFLUSHMAPPEDBUFFERRANGEPROC, glFlushMappedBufferRange); \ HookExtension(PFNGLBINDVERTEXARRAYPROC, glBindVertexArray); \ @@ -421,10 +476,13 @@ HookExtension(PFNGLISVERTEXARRAYPROC, glIsVertexArray); \ HookExtension(PFNGLDRAWARRAYSINSTANCEDPROC, glDrawArraysInstanced); \ HookExtensionAlias(PFNGLDRAWARRAYSINSTANCEDPROC, glDrawArraysInstanced, glDrawArraysInstancedARB); \ + HookExtensionAlias(PFNGLDRAWARRAYSINSTANCEDPROC, glDrawArraysInstanced, glDrawArraysInstancedEXT); \ HookExtension(PFNGLDRAWELEMENTSINSTANCEDPROC, glDrawElementsInstanced); \ HookExtensionAlias(PFNGLDRAWELEMENTSINSTANCEDPROC, glDrawElementsInstanced, glDrawElementsInstancedARB); \ + HookExtensionAlias(PFNGLDRAWELEMENTSINSTANCEDPROC, glDrawElementsInstanced, glDrawElementsInstancedEXT); \ HookExtension(PFNGLTEXBUFFERPROC, glTexBuffer); \ HookExtensionAlias(PFNGLTEXBUFFERPROC, glTexBuffer, glTexBufferARB); \ + HookExtensionAlias(PFNGLTEXBUFFERPROC, glTexBuffer, glTexBufferEXT); \ HookExtension(PFNGLPRIMITIVERESTARTINDEXPROC, glPrimitiveRestartIndex); \ HookExtension(PFNGLCOPYBUFFERSUBDATAPROC, glCopyBufferSubData); \ HookExtension(PFNGLGETUNIFORMINDICESPROC, glGetUniformIndices); \ @@ -439,6 +497,7 @@ HookExtension(PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC, glDrawElementsInstancedBaseVertex); \ HookExtension(PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC, glMultiDrawElementsBaseVertex); \ HookExtension(PFNGLPROVOKINGVERTEXPROC, glProvokingVertex); \ + HookExtensionAlias(PFNGLPROVOKINGVERTEXPROC, glProvokingVertex, glProvokingVertexEXT); \ HookExtension(PFNGLFENCESYNCPROC, glFenceSync); \ HookExtension(PFNGLISSYNCPROC, glIsSync); \ HookExtension(PFNGLDELETESYNCPROC, glDeleteSync); \ @@ -606,15 +665,25 @@ HookExtension(PFNGLVALIDATEPROGRAMPIPELINEPROC, glValidateProgramPipeline); \ HookExtension(PFNGLGETPROGRAMPIPELINEINFOLOGPROC, glGetProgramPipelineInfoLog); \ HookExtension(PFNGLVERTEXATTRIBL1DPROC, glVertexAttribL1d); \ + HookExtensionAlias(PFNGLVERTEXATTRIBL1DPROC, glVertexAttribL1d, glVertexAttribL1dEXT); \ HookExtension(PFNGLVERTEXATTRIBL2DPROC, glVertexAttribL2d); \ + HookExtensionAlias(PFNGLVERTEXATTRIBL2DPROC, glVertexAttribL2d, glVertexAttribL2dEXT); \ HookExtension(PFNGLVERTEXATTRIBL3DPROC, glVertexAttribL3d); \ + HookExtensionAlias(PFNGLVERTEXATTRIBL3DPROC, glVertexAttribL3d, glVertexAttribL3dEXT); \ HookExtension(PFNGLVERTEXATTRIBL4DPROC, glVertexAttribL4d); \ + HookExtensionAlias(PFNGLVERTEXATTRIBL4DPROC, glVertexAttribL4d, glVertexAttribL4dEXT); \ HookExtension(PFNGLVERTEXATTRIBL1DVPROC, glVertexAttribL1dv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBL1DVPROC, glVertexAttribL1dv, glVertexAttribL1dvEXT); \ HookExtension(PFNGLVERTEXATTRIBL2DVPROC, glVertexAttribL2dv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBL2DVPROC, glVertexAttribL2dv, glVertexAttribL2dvEXT); \ HookExtension(PFNGLVERTEXATTRIBL3DVPROC, glVertexAttribL3dv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBL3DVPROC, glVertexAttribL3dv, glVertexAttribL3dvEXT); \ HookExtension(PFNGLVERTEXATTRIBL4DVPROC, glVertexAttribL4dv); \ + HookExtensionAlias(PFNGLVERTEXATTRIBL4DVPROC, glVertexAttribL4dv, glVertexAttribL4dvEXT); \ HookExtension(PFNGLVERTEXATTRIBLPOINTERPROC, glVertexAttribLPointer); \ + HookExtensionAlias(PFNGLVERTEXATTRIBLPOINTERPROC, glVertexAttribLPointer, glVertexAttribLPointerEXT); \ HookExtension(PFNGLGETVERTEXATTRIBLDVPROC, glGetVertexAttribLdv); \ + HookExtensionAlias(PFNGLGETVERTEXATTRIBLDVPROC, glGetVertexAttribLdv, glGetVertexAttribLdvEXT); \ HookExtension(PFNGLVIEWPORTARRAYVPROC, glViewportArrayv); \ HookExtension(PFNGLVIEWPORTINDEXEDFPROC, glViewportIndexedf); \ HookExtension(PFNGLVIEWPORTINDEXEDFVPROC, glViewportIndexedfv); \ @@ -633,7 +702,9 @@ HookExtension(PFNGLGETINTERNALFORMATIVPROC, glGetInternalformativ); \ HookExtension(PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC, glGetActiveAtomicCounterBufferiv); \ HookExtension(PFNGLBINDIMAGETEXTUREPROC, glBindImageTexture); \ + HookExtensionAlias(PFNGLBINDIMAGETEXTUREPROC, glBindImageTexture, glBindImageTextureEXT); \ HookExtension(PFNGLMEMORYBARRIERPROC, glMemoryBarrier); \ + HookExtensionAlias(PFNGLMEMORYBARRIERPROC, glMemoryBarrier, glMemoryBarrierEXT); \ HookExtension(PFNGLTEXSTORAGE1DPROC, glTexStorage1D); \ HookExtension(PFNGLTEXSTORAGE2DPROC, glTexStorage2D); \ HookExtension(PFNGLTEXSTORAGE3DPROC, glTexStorage3D); \ @@ -2376,10 +2447,7 @@ HookWrapper3(void, gluniformbufferext, GLuint, program, GLint, location, GLuint, buffer); \ HookWrapper2(GLint, glgetuniformbuffersizeext, GLuint, program, GLint, location); \ HookWrapper2(GLintptr, glgetuniformoffsetext, GLuint, program, GLint, location); \ - HookWrapper4(void, glblendcolorext, GLfloat, red, GLfloat, green, GLfloat, blue, GLfloat, alpha); \ - HookWrapper2(void, glblendequationseparateext, GLenum, modeRGB, GLenum, modeAlpha); \ HookWrapper4(void, glblendfuncseparateext, GLenum, sfactorRGB, GLenum, dfactorRGB, GLenum, sfactorAlpha, GLenum, dfactorAlpha); \ - HookWrapper1(void, glblendequationext, GLenum, mode); \ HookWrapper6(void, glcolorsubtableext, GLenum, target, GLsizei, start, GLsizei, count, GLenum, format, GLenum, type, const void *, data); \ HookWrapper5(void, glcopycolorsubtableext, GLenum, target, GLsizei, start, GLint, x, GLint, y, GLsizei, width); \ HookWrapper2(void, gllockarraysext, GLint, first, GLsizei, count); \ @@ -2555,30 +2623,14 @@ HookWrapper5(void, glprogramuniformmatrix4x2dvext, GLuint, program, GLint, location, GLsizei, count, GLboolean, transpose, const GLdouble *, value); \ HookWrapper5(void, glprogramuniformmatrix4x3dvext, GLuint, program, GLint, location, GLsizei, count, GLboolean, transpose, const GLdouble *, value); \ HookWrapper9(void, gltexturepagecommitmentext, GLuint, texture, GLint, level, GLint, xoffset, GLint, yoffset, GLint, zoffset, GLsizei, width, GLsizei, height, GLsizei, depth, GLboolean, resident); \ - HookWrapper5(void, glcolormaskindexedext, GLuint, index, GLboolean, r, GLboolean, g, GLboolean, b, GLboolean, a); \ - HookWrapper4(void, gldrawarraysinstancedext, GLenum, mode, GLint, start, GLsizei, count, GLsizei, primcount); \ - HookWrapper5(void, gldrawelementsinstancedext, GLenum, mode, GLsizei, count, GLenum, type, const void *, indices, GLsizei, primcount); \ - HookWrapper6(void, gldrawrangeelementsext, GLenum, mode, GLuint, start, GLuint, end, GLsizei, count, GLenum, type, const void *, indices); \ HookWrapper1(void, glfogcoordfext, GLfloat, coord); \ HookWrapper1(void, glfogcoordfvext, const GLfloat *, coord); \ HookWrapper1(void, glfogcoorddext, GLdouble, coord); \ HookWrapper1(void, glfogcoorddvext, const GLdouble *, coord); \ HookWrapper3(void, glfogcoordpointerext, GLenum, type, GLsizei, stride, const void *, pointer); \ - HookWrapper5(void, glrenderbufferstoragemultisampleext, GLenum, target, GLsizei, samples, GLenum, internalformat, GLsizei, width, GLsizei, height); \ HookWrapper3(void, glprogramparameteriext, GLuint, program, GLenum, pname, GLint, value); \ HookWrapper4(void, glprogramenvparameters4fvext, GLenum, target, GLuint, index, GLsizei, count, const GLfloat *, params); \ HookWrapper4(void, glprogramlocalparameters4fvext, GLenum, target, GLuint, index, GLsizei, count, const GLfloat *, params); \ - HookWrapper3(void, glgetuniformuivext, GLuint, program, GLint, location, GLuint *, params); \ - HookWrapper3(void, glbindfragdatalocationext, GLuint, program, GLuint, color, const GLchar *, name); \ - HookWrapper2(GLint, glgetfragdatalocationext, GLuint, program, const GLchar *, name); \ - HookWrapper2(void, gluniform1uiext, GLint, location, GLuint, v0); \ - HookWrapper3(void, gluniform2uiext, GLint, location, GLuint, v0, GLuint, v1); \ - HookWrapper4(void, gluniform3uiext, GLint, location, GLuint, v0, GLuint, v1, GLuint, v2); \ - HookWrapper5(void, gluniform4uiext, GLint, location, GLuint, v0, GLuint, v1, GLuint, v2, GLuint, v3); \ - HookWrapper3(void, gluniform1uivext, GLint, location, GLsizei, count, const GLuint *, value); \ - HookWrapper3(void, gluniform2uivext, GLint, location, GLsizei, count, const GLuint *, value); \ - HookWrapper3(void, gluniform3uivext, GLint, location, GLsizei, count, const GLuint *, value); \ - HookWrapper3(void, gluniform4uivext, GLint, location, GLsizei, count, const GLuint *, value); \ HookWrapper5(void, glgethistogramext, GLenum, target, GLboolean, reset, GLenum, format, GLenum, type, void *, values); \ HookWrapper3(void, glgethistogramparameterfvext, GLenum, target, GLenum, pname, GLfloat *, params); \ HookWrapper3(void, glgethistogramparameterivext, GLenum, target, GLenum, pname, GLint *, params); \ @@ -2594,7 +2646,6 @@ HookWrapper1(void, glapplytextureext, GLenum, mode); \ HookWrapper1(void, gltexturelightext, GLenum, pname); \ HookWrapper2(void, gltexturematerialext, GLenum, face, GLenum, mode); \ - HookWrapper4(void, glmultidrawarraysext, GLenum, mode, const GLint *, first, const GLsizei *, count, GLsizei, primcount); \ HookWrapper5(void, glmultidrawelementsext, GLenum, mode, const GLsizei *, count, GLenum, type, const void *const*, indices, GLsizei, primcount); \ HookWrapper2(void, glsamplemaskext, GLclampf, value, GLboolean, invert); \ HookWrapper1(void, glsamplepatternext, GLenum, pattern); \ @@ -2611,7 +2662,6 @@ HookWrapper2(void, glpointparameterfext, GLenum, pname, GLfloat, param); \ HookWrapper2(void, glpointparameterfvext, GLenum, pname, const GLfloat *, params); \ HookWrapper2(void, glpolygonoffsetext, GLfloat, factor, GLfloat, bias); \ - HookWrapper1(void, glprovokingvertexext, GLenum, mode); \ HookWrapper2(void, glrastersamplesext, GLuint, samples, GLboolean, fixedsamplelocations); \ HookWrapper3(void, glsecondarycolor3bext, GLbyte, red, GLbyte, green, GLbyte, blue); \ HookWrapper1(void, glsecondarycolor3bvext, const GLbyte *, v); \ @@ -2633,20 +2683,11 @@ HookWrapper2(void, gluseshaderprogramext, GLenum, type, GLuint, program); \ HookWrapper1(void, glactiveprogramext, GLuint, program); \ HookWrapper2(GLuint, glcreateshaderprogramext, GLenum, type, const GLchar *, string); \ - HookWrapper7(void, glbindimagetextureext, GLuint, index, GLuint, texture, GLint, level, GLboolean, layered, GLint, layer, GLenum, access, GLint, format); \ - HookWrapper1(void, glmemorybarrierext, GLbitfield, barriers); \ HookWrapper2(void, glstencilcleartagext, GLsizei, stencilTagBits, GLuint, stencilClearTag); \ HookWrapper1(void, glactivestencilfaceext, GLenum, face); \ HookWrapper7(void, gltexsubimage1dext, GLenum, target, GLint, level, GLint, xoffset, GLsizei, width, GLenum, format, GLenum, type, const void *, pixels); \ HookWrapper9(void, gltexsubimage2dext, GLenum, target, GLint, level, GLint, xoffset, GLint, yoffset, GLsizei, width, GLsizei, height, GLenum, format, GLenum, type, const void *, pixels); \ - HookWrapper10(void, glteximage3dext, GLenum, target, GLint, level, GLenum, internalformat, GLsizei, width, GLsizei, height, GLsizei, depth, GLint, border, GLenum, format, GLenum, type, const void *, pixels); \ HookWrapper11(void, gltexsubimage3dext, GLenum, target, GLint, level, GLint, xoffset, GLint, yoffset, GLint, zoffset, GLsizei, width, GLsizei, height, GLsizei, depth, GLenum, format, GLenum, type, const void *, pixels); \ - HookWrapper5(void, glframebuffertexturelayerext, GLenum, target, GLenum, attachment, GLuint, texture, GLint, level, GLint, layer); \ - HookWrapper3(void, gltexbufferext, GLenum, target, GLenum, internalformat, GLuint, buffer); \ - HookWrapper3(void, gltexparameteriivext, GLenum, target, GLenum, pname, const GLint *, params); \ - HookWrapper3(void, gltexparameteriuivext, GLenum, target, GLenum, pname, const GLuint *, params); \ - HookWrapper3(void, glgettexparameteriivext, GLenum, target, GLenum, pname, GLint *, params); \ - HookWrapper3(void, glgettexparameteriuivext, GLenum, target, GLenum, pname, GLuint *, params); \ HookWrapper4(void, glclearcoloriiext, GLint, red, GLint, green, GLint, blue, GLint, alpha); \ HookWrapper4(void, glclearcoloriuiext, GLuint, red, GLuint, green, GLuint, blue, GLuint, alpha); \ HookWrapper3(GLboolean, glaretexturesresidentext, GLsizei, n, const GLuint *, textures, GLboolean *, residences); \ @@ -2656,13 +2697,7 @@ HookWrapper1(GLboolean, glistextureext, GLuint, texture); \ HookWrapper3(void, glprioritizetexturesext, GLsizei, n, const GLuint *, textures, const GLclampf *, priorities); \ HookWrapper1(void, gltexturenormalext, GLenum, mode); \ - HookWrapper1(void, glbegintransformfeedbackext, GLenum, primitiveMode); \ - HookWrapper0(void, glendtransformfeedbackext); \ - HookWrapper5(void, glbindbufferrangeext, GLenum, target, GLuint, index, GLuint, buffer, GLintptr, offset, GLsizeiptr, size); \ HookWrapper4(void, glbindbufferoffsetext, GLenum, target, GLuint, index, GLuint, buffer, GLintptr, offset); \ - HookWrapper3(void, glbindbufferbaseext, GLenum, target, GLuint, index, GLuint, buffer); \ - HookWrapper4(void, gltransformfeedbackvaryingsext, GLuint, program, GLsizei, count, const GLchar *const*, varyings, GLenum, bufferMode); \ - HookWrapper7(void, glgettransformfeedbackvaryingext, GLuint, program, GLuint, index, GLsizei, bufSize, GLsizei *, length, GLsizei *, size, GLenum *, type, GLchar *, name); \ HookWrapper1(void, glarrayelementext, GLint, i); \ HookWrapper5(void, glcolorpointerext, GLint, size, GLenum, type, GLsizei, stride, GLsizei, count, const void *, pointer); \ HookWrapper3(void, gldrawarraysext, GLenum, mode, GLint, first, GLsizei, count); \ @@ -2672,16 +2707,6 @@ HookWrapper4(void, glnormalpointerext, GLenum, type, GLsizei, stride, GLsizei, count, const void *, pointer); \ HookWrapper5(void, gltexcoordpointerext, GLint, size, GLenum, type, GLsizei, stride, GLsizei, count, const void *, pointer); \ HookWrapper5(void, glvertexpointerext, GLint, size, GLenum, type, GLsizei, stride, GLsizei, count, const void *, pointer); \ - HookWrapper2(void, glvertexattribl1dext, GLuint, index, GLdouble, x); \ - HookWrapper3(void, glvertexattribl2dext, GLuint, index, GLdouble, x, GLdouble, y); \ - HookWrapper4(void, glvertexattribl3dext, GLuint, index, GLdouble, x, GLdouble, y, GLdouble, z); \ - HookWrapper5(void, glvertexattribl4dext, GLuint, index, GLdouble, x, GLdouble, y, GLdouble, z, GLdouble, w); \ - HookWrapper2(void, glvertexattribl1dvext, GLuint, index, const GLdouble *, v); \ - HookWrapper2(void, glvertexattribl2dvext, GLuint, index, const GLdouble *, v); \ - HookWrapper2(void, glvertexattribl3dvext, GLuint, index, const GLdouble *, v); \ - HookWrapper2(void, glvertexattribl4dvext, GLuint, index, const GLdouble *, v); \ - HookWrapper5(void, glvertexattriblpointerext, GLuint, index, GLint, size, GLenum, type, GLsizei, stride, const void *, pointer); \ - HookWrapper3(void, glgetvertexattribldvext, GLuint, index, GLenum, pname, GLdouble *, params); \ HookWrapper0(void, glbeginvertexshaderext); \ HookWrapper0(void, glendvertexshaderext); \ HookWrapper1(void, glbindvertexshaderext, GLuint, id); \ @@ -3165,29 +3190,6 @@ HookWrapper3(void, glvertexattribs4fvnv, GLuint, index, GLsizei, count, const GLfloat *, v); \ HookWrapper3(void, glvertexattribs4svnv, GLuint, index, GLsizei, count, const GLshort *, v); \ HookWrapper3(void, glvertexattribs4ubvnv, GLuint, index, GLsizei, count, const GLubyte *, v); \ - HookWrapper2(void, glvertexattribi1iext, GLuint, index, GLint, x); \ - HookWrapper3(void, glvertexattribi2iext, GLuint, index, GLint, x, GLint, y); \ - HookWrapper4(void, glvertexattribi3iext, GLuint, index, GLint, x, GLint, y, GLint, z); \ - HookWrapper5(void, glvertexattribi4iext, GLuint, index, GLint, x, GLint, y, GLint, z, GLint, w); \ - HookWrapper2(void, glvertexattribi1uiext, GLuint, index, GLuint, x); \ - HookWrapper3(void, glvertexattribi2uiext, GLuint, index, GLuint, x, GLuint, y); \ - HookWrapper4(void, glvertexattribi3uiext, GLuint, index, GLuint, x, GLuint, y, GLuint, z); \ - HookWrapper5(void, glvertexattribi4uiext, GLuint, index, GLuint, x, GLuint, y, GLuint, z, GLuint, w); \ - HookWrapper2(void, glvertexattribi1ivext, GLuint, index, const GLint *, v); \ - HookWrapper2(void, glvertexattribi2ivext, GLuint, index, const GLint *, v); \ - HookWrapper2(void, glvertexattribi3ivext, GLuint, index, const GLint *, v); \ - HookWrapper2(void, glvertexattribi4ivext, GLuint, index, const GLint *, v); \ - HookWrapper2(void, glvertexattribi1uivext, GLuint, index, const GLuint *, v); \ - HookWrapper2(void, glvertexattribi2uivext, GLuint, index, const GLuint *, v); \ - HookWrapper2(void, glvertexattribi3uivext, GLuint, index, const GLuint *, v); \ - HookWrapper2(void, glvertexattribi4uivext, GLuint, index, const GLuint *, v); \ - HookWrapper2(void, glvertexattribi4bvext, GLuint, index, const GLbyte *, v); \ - HookWrapper2(void, glvertexattribi4svext, GLuint, index, const GLshort *, v); \ - HookWrapper2(void, glvertexattribi4ubvext, GLuint, index, const GLubyte *, v); \ - HookWrapper2(void, glvertexattribi4usvext, GLuint, index, const GLushort *, v); \ - HookWrapper5(void, glvertexattribipointerext, GLuint, index, GLint, size, GLenum, type, GLsizei, stride, const void *, pointer); \ - HookWrapper3(void, glgetvertexattribiivext, GLuint, index, GLenum, pname, GLint *, params); \ - HookWrapper3(void, glgetvertexattribiuivext, GLuint, index, GLenum, pname, GLuint *, params); \ HookWrapper1(void, glbeginvideocapturenv, GLuint, video_capture_slot); \ HookWrapper4(void, glbindvideocapturestreambuffernv, GLuint, video_capture_slot, GLuint, stream, GLenum, frame_region, GLintptrARB, offset); \ HookWrapper5(void, glbindvideocapturestreamtexturenv, GLuint, video_capture_slot, GLuint, stream, GLenum, frame_region, GLenum, target, GLuint, texture); \ @@ -4066,10 +4068,7 @@ HandleUnsupported(PFNGLUNIFORMBUFFEREXTPROC, gluniformbufferext); \ HandleUnsupported(PFNGLGETUNIFORMBUFFERSIZEEXTPROC, glgetuniformbuffersizeext); \ HandleUnsupported(PFNGLGETUNIFORMOFFSETEXTPROC, glgetuniformoffsetext); \ - HandleUnsupported(PFNGLBLENDCOLOREXTPROC, glblendcolorext); \ - HandleUnsupported(PFNGLBLENDEQUATIONSEPARATEEXTPROC, glblendequationseparateext); \ HandleUnsupported(PFNGLBLENDFUNCSEPARATEEXTPROC, glblendfuncseparateext); \ - HandleUnsupported(PFNGLBLENDEQUATIONEXTPROC, glblendequationext); \ HandleUnsupported(PFNGLCOLORSUBTABLEEXTPROC, glcolorsubtableext); \ HandleUnsupported(PFNGLCOPYCOLORSUBTABLEEXTPROC, glcopycolorsubtableext); \ HandleUnsupported(PFNGLLOCKARRAYSEXTPROC, gllockarraysext); \ @@ -4245,30 +4244,14 @@ HandleUnsupported(PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC, glprogramuniformmatrix4x2dvext); \ HandleUnsupported(PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC, glprogramuniformmatrix4x3dvext); \ HandleUnsupported(PFNGLTEXTUREPAGECOMMITMENTEXTPROC, gltexturepagecommitmentext); \ - HandleUnsupported(PFNGLCOLORMASKINDEXEDEXTPROC, glcolormaskindexedext); \ - HandleUnsupported(PFNGLDRAWARRAYSINSTANCEDEXTPROC, gldrawarraysinstancedext); \ - HandleUnsupported(PFNGLDRAWELEMENTSINSTANCEDEXTPROC, gldrawelementsinstancedext); \ - HandleUnsupported(PFNGLDRAWRANGEELEMENTSEXTPROC, gldrawrangeelementsext); \ HandleUnsupported(PFNGLFOGCOORDFEXTPROC, glfogcoordfext); \ HandleUnsupported(PFNGLFOGCOORDFVEXTPROC, glfogcoordfvext); \ HandleUnsupported(PFNGLFOGCOORDDEXTPROC, glfogcoorddext); \ HandleUnsupported(PFNGLFOGCOORDDVEXTPROC, glfogcoorddvext); \ HandleUnsupported(PFNGLFOGCOORDPOINTEREXTPROC, glfogcoordpointerext); \ - HandleUnsupported(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC, glrenderbufferstoragemultisampleext); \ HandleUnsupported(PFNGLPROGRAMPARAMETERIEXTPROC, glprogramparameteriext); \ HandleUnsupported(PFNGLPROGRAMENVPARAMETERS4FVEXTPROC, glprogramenvparameters4fvext); \ HandleUnsupported(PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC, glprogramlocalparameters4fvext); \ - HandleUnsupported(PFNGLGETUNIFORMUIVEXTPROC, glgetuniformuivext); \ - HandleUnsupported(PFNGLBINDFRAGDATALOCATIONEXTPROC, glbindfragdatalocationext); \ - HandleUnsupported(PFNGLGETFRAGDATALOCATIONEXTPROC, glgetfragdatalocationext); \ - HandleUnsupported(PFNGLUNIFORM1UIEXTPROC, gluniform1uiext); \ - HandleUnsupported(PFNGLUNIFORM2UIEXTPROC, gluniform2uiext); \ - HandleUnsupported(PFNGLUNIFORM3UIEXTPROC, gluniform3uiext); \ - HandleUnsupported(PFNGLUNIFORM4UIEXTPROC, gluniform4uiext); \ - HandleUnsupported(PFNGLUNIFORM1UIVEXTPROC, gluniform1uivext); \ - HandleUnsupported(PFNGLUNIFORM2UIVEXTPROC, gluniform2uivext); \ - HandleUnsupported(PFNGLUNIFORM3UIVEXTPROC, gluniform3uivext); \ - HandleUnsupported(PFNGLUNIFORM4UIVEXTPROC, gluniform4uivext); \ HandleUnsupported(PFNGLGETHISTOGRAMEXTPROC, glgethistogramext); \ HandleUnsupported(PFNGLGETHISTOGRAMPARAMETERFVEXTPROC, glgethistogramparameterfvext); \ HandleUnsupported(PFNGLGETHISTOGRAMPARAMETERIVEXTPROC, glgethistogramparameterivext); \ @@ -4284,7 +4267,6 @@ HandleUnsupported(PFNGLAPPLYTEXTUREEXTPROC, glapplytextureext); \ HandleUnsupported(PFNGLTEXTURELIGHTEXTPROC, gltexturelightext); \ HandleUnsupported(PFNGLTEXTUREMATERIALEXTPROC, gltexturematerialext); \ - HandleUnsupported(PFNGLMULTIDRAWARRAYSEXTPROC, glmultidrawarraysext); \ HandleUnsupported(PFNGLMULTIDRAWELEMENTSEXTPROC, glmultidrawelementsext); \ HandleUnsupported(PFNGLSAMPLEMASKEXTPROC, glsamplemaskext); \ HandleUnsupported(PFNGLSAMPLEPATTERNEXTPROC, glsamplepatternext); \ @@ -4301,7 +4283,6 @@ HandleUnsupported(PFNGLPOINTPARAMETERFEXTPROC, glpointparameterfext); \ HandleUnsupported(PFNGLPOINTPARAMETERFVEXTPROC, glpointparameterfvext); \ HandleUnsupported(PFNGLPOLYGONOFFSETEXTPROC, glpolygonoffsetext); \ - HandleUnsupported(PFNGLPROVOKINGVERTEXEXTPROC, glprovokingvertexext); \ HandleUnsupported(PFNGLRASTERSAMPLESEXTPROC, glrastersamplesext); \ HandleUnsupported(PFNGLSECONDARYCOLOR3BEXTPROC, glsecondarycolor3bext); \ HandleUnsupported(PFNGLSECONDARYCOLOR3BVEXTPROC, glsecondarycolor3bvext); \ @@ -4323,20 +4304,11 @@ HandleUnsupported(PFNGLUSESHADERPROGRAMEXTPROC, gluseshaderprogramext); \ HandleUnsupported(PFNGLACTIVEPROGRAMEXTPROC, glactiveprogramext); \ HandleUnsupported(PFNGLCREATESHADERPROGRAMEXTPROC, glcreateshaderprogramext); \ - HandleUnsupported(PFNGLBINDIMAGETEXTUREEXTPROC, glbindimagetextureext); \ - HandleUnsupported(PFNGLMEMORYBARRIEREXTPROC, glmemorybarrierext); \ HandleUnsupported(PFNGLSTENCILCLEARTAGEXTPROC, glstencilcleartagext); \ HandleUnsupported(PFNGLACTIVESTENCILFACEEXTPROC, glactivestencilfaceext); \ HandleUnsupported(PFNGLTEXSUBIMAGE1DEXTPROC, gltexsubimage1dext); \ HandleUnsupported(PFNGLTEXSUBIMAGE2DEXTPROC, gltexsubimage2dext); \ - HandleUnsupported(PFNGLTEXIMAGE3DEXTPROC, glteximage3dext); \ HandleUnsupported(PFNGLTEXSUBIMAGE3DEXTPROC, gltexsubimage3dext); \ - HandleUnsupported(PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC, glframebuffertexturelayerext); \ - HandleUnsupported(PFNGLTEXBUFFEREXTPROC, gltexbufferext); \ - HandleUnsupported(PFNGLTEXPARAMETERIIVEXTPROC, gltexparameteriivext); \ - HandleUnsupported(PFNGLTEXPARAMETERIUIVEXTPROC, gltexparameteriuivext); \ - HandleUnsupported(PFNGLGETTEXPARAMETERIIVEXTPROC, glgettexparameteriivext); \ - HandleUnsupported(PFNGLGETTEXPARAMETERIUIVEXTPROC, glgettexparameteriuivext); \ HandleUnsupported(PFNGLCLEARCOLORIIEXTPROC, glclearcoloriiext); \ HandleUnsupported(PFNGLCLEARCOLORIUIEXTPROC, glclearcoloriuiext); \ HandleUnsupported(PFNGLARETEXTURESRESIDENTEXTPROC, glaretexturesresidentext); \ @@ -4346,13 +4318,7 @@ HandleUnsupported(PFNGLISTEXTUREEXTPROC, glistextureext); \ HandleUnsupported(PFNGLPRIORITIZETEXTURESEXTPROC, glprioritizetexturesext); \ HandleUnsupported(PFNGLTEXTURENORMALEXTPROC, gltexturenormalext); \ - HandleUnsupported(PFNGLBEGINTRANSFORMFEEDBACKEXTPROC, glbegintransformfeedbackext); \ - HandleUnsupported(PFNGLENDTRANSFORMFEEDBACKEXTPROC, glendtransformfeedbackext); \ - HandleUnsupported(PFNGLBINDBUFFERRANGEEXTPROC, glbindbufferrangeext); \ HandleUnsupported(PFNGLBINDBUFFEROFFSETEXTPROC, glbindbufferoffsetext); \ - HandleUnsupported(PFNGLBINDBUFFERBASEEXTPROC, glbindbufferbaseext); \ - HandleUnsupported(PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC, gltransformfeedbackvaryingsext); \ - HandleUnsupported(PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC, glgettransformfeedbackvaryingext); \ HandleUnsupported(PFNGLARRAYELEMENTEXTPROC, glarrayelementext); \ HandleUnsupported(PFNGLCOLORPOINTEREXTPROC, glcolorpointerext); \ HandleUnsupported(PFNGLDRAWARRAYSEXTPROC, gldrawarraysext); \ @@ -4362,16 +4328,6 @@ HandleUnsupported(PFNGLNORMALPOINTEREXTPROC, glnormalpointerext); \ HandleUnsupported(PFNGLTEXCOORDPOINTEREXTPROC, gltexcoordpointerext); \ HandleUnsupported(PFNGLVERTEXPOINTEREXTPROC, glvertexpointerext); \ - HandleUnsupported(PFNGLVERTEXATTRIBL1DEXTPROC, glvertexattribl1dext); \ - HandleUnsupported(PFNGLVERTEXATTRIBL2DEXTPROC, glvertexattribl2dext); \ - HandleUnsupported(PFNGLVERTEXATTRIBL3DEXTPROC, glvertexattribl3dext); \ - HandleUnsupported(PFNGLVERTEXATTRIBL4DEXTPROC, glvertexattribl4dext); \ - HandleUnsupported(PFNGLVERTEXATTRIBL1DVEXTPROC, glvertexattribl1dvext); \ - HandleUnsupported(PFNGLVERTEXATTRIBL2DVEXTPROC, glvertexattribl2dvext); \ - HandleUnsupported(PFNGLVERTEXATTRIBL3DVEXTPROC, glvertexattribl3dvext); \ - HandleUnsupported(PFNGLVERTEXATTRIBL4DVEXTPROC, glvertexattribl4dvext); \ - HandleUnsupported(PFNGLVERTEXATTRIBLPOINTEREXTPROC, glvertexattriblpointerext); \ - HandleUnsupported(PFNGLGETVERTEXATTRIBLDVEXTPROC, glgetvertexattribldvext); \ HandleUnsupported(PFNGLBEGINVERTEXSHADEREXTPROC, glbeginvertexshaderext); \ HandleUnsupported(PFNGLENDVERTEXSHADEREXTPROC, glendvertexshaderext); \ HandleUnsupported(PFNGLBINDVERTEXSHADEREXTPROC, glbindvertexshaderext); \ @@ -4855,29 +4811,6 @@ HandleUnsupported(PFNGLVERTEXATTRIBS4FVNVPROC, glvertexattribs4fvnv); \ HandleUnsupported(PFNGLVERTEXATTRIBS4SVNVPROC, glvertexattribs4svnv); \ HandleUnsupported(PFNGLVERTEXATTRIBS4UBVNVPROC, glvertexattribs4ubvnv); \ - HandleUnsupported(PFNGLVERTEXATTRIBI1IEXTPROC, glvertexattribi1iext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI2IEXTPROC, glvertexattribi2iext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI3IEXTPROC, glvertexattribi3iext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI4IEXTPROC, glvertexattribi4iext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI1UIEXTPROC, glvertexattribi1uiext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI2UIEXTPROC, glvertexattribi2uiext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI3UIEXTPROC, glvertexattribi3uiext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI4UIEXTPROC, glvertexattribi4uiext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI1IVEXTPROC, glvertexattribi1ivext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI2IVEXTPROC, glvertexattribi2ivext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI3IVEXTPROC, glvertexattribi3ivext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI4IVEXTPROC, glvertexattribi4ivext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI1UIVEXTPROC, glvertexattribi1uivext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI2UIVEXTPROC, glvertexattribi2uivext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI3UIVEXTPROC, glvertexattribi3uivext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI4UIVEXTPROC, glvertexattribi4uivext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI4BVEXTPROC, glvertexattribi4bvext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI4SVEXTPROC, glvertexattribi4svext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI4UBVEXTPROC, glvertexattribi4ubvext); \ - HandleUnsupported(PFNGLVERTEXATTRIBI4USVEXTPROC, glvertexattribi4usvext); \ - HandleUnsupported(PFNGLVERTEXATTRIBIPOINTEREXTPROC, glvertexattribipointerext); \ - HandleUnsupported(PFNGLGETVERTEXATTRIBIIVEXTPROC, glgetvertexattribiivext); \ - HandleUnsupported(PFNGLGETVERTEXATTRIBIUIVEXTPROC, glgetvertexattribiuivext); \ HandleUnsupported(PFNGLBEGINVIDEOCAPTURENVPROC, glbeginvideocapturenv); \ HandleUnsupported(PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC, glbindvideocapturestreambuffernv); \ HandleUnsupported(PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC, glbindvideocapturestreamtexturenv); \