From 6a66492f83ef801629416db97c1dda855aca5d7b Mon Sep 17 00:00:00 2001 From: babymustgrowstrong Date: Sat, 13 May 2017 15:49:08 -0700 Subject: [PATCH] GL_OES_tessellation_shader and GL_EXT_tessellation_shader support --- renderdoc/driver/gl/gl_driver.cpp | 6 ++++-- renderdoc/driver/gl/gl_hookset.h | 2 +- renderdoc/driver/gl/gl_hookset_defs.h | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index fdc339f2c..256912bf9 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -735,15 +735,16 @@ 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_sample_shading"); m_GLESExtensions.push_back("GL_OES_standard_derivatives"); + m_GLESExtensions.push_back("GL_OES_tessellation_shader"); m_GLESExtensions.push_back("GL_OES_texture_compression_astc"); m_GLESExtensions.push_back("GL_OES_texture_stencil8"); m_GLESExtensions.push_back("GL_OES_texture_float"); m_GLESExtensions.push_back("GL_OES_texture_float_linear"); m_GLESExtensions.push_back("GL_OES_texture_half_float"); m_GLESExtensions.push_back("GL_OES_texture_half_float_linear"); - m_GLESExtensions.push_back("GL_OES_sample_shading"); - + m_GLESExtensions.push_back("GL_EXT_copy_image"); m_GLESExtensions.push_back("GL_EXT_draw_buffers_indexed"); m_GLESExtensions.push_back("GL_EXT_geometry_point_size"); @@ -751,6 +752,7 @@ void WrappedOpenGL::BuildGLESExtensions() m_GLESExtensions.push_back("GL_EXT_sRGB"); m_GLESExtensions.push_back("GL_EXT_sRGB_write_control"); m_GLESExtensions.push_back("GL_EXT_pvrtc_sRGB"); + m_GLESExtensions.push_back("GL_EXT_tessellation_shader"); m_GLESExtensions.push_back("GL_EXT_texture_format_BGRA8888"); m_GLESExtensions.push_back("GL_EXT_texture_norm16"); m_GLESExtensions.push_back("GL_EXT_texture_rg"); diff --git a/renderdoc/driver/gl/gl_hookset.h b/renderdoc/driver/gl/gl_hookset.h index ccd2ed1f2..4861f959b 100644 --- a/renderdoc/driver/gl/gl_hookset.h +++ b/renderdoc/driver/gl/gl_hookset.h @@ -450,7 +450,7 @@ struct GLHookSet PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv; PFNGLSAMPLERPARAMETERIIVPROC glSamplerParameterIiv; PFNGLSAMPLERPARAMETERIUIVPROC glSamplerParameterIuiv; - PFNGLPATCHPARAMETERIPROC glPatchParameteri; + PFNGLPATCHPARAMETERIPROC glPatchParameteri; // aliases glPatchParameteriEXT, glPatchParameteriOES PFNGLPATCHPARAMETERFVPROC glPatchParameterfv; PFNGLPOINTPARAMETERFPROC glPointParameterf; // aliases glPointParameterfARB, glPointParameterfEXT PFNGLPOINTPARAMETERFVPROC glPointParameterfv; // aliases glPointParameterfvARB, glPointParameterfvEXT diff --git a/renderdoc/driver/gl/gl_hookset_defs.h b/renderdoc/driver/gl/gl_hookset_defs.h index 146c90feb..68af3cf26 100644 --- a/renderdoc/driver/gl/gl_hookset_defs.h +++ b/renderdoc/driver/gl/gl_hookset_defs.h @@ -596,6 +596,8 @@ HookExtension(PFNGLGETUNIFORMSUBROUTINEUIVPROC, glGetUniformSubroutineuiv); \ HookExtension(PFNGLGETPROGRAMSTAGEIVPROC, glGetProgramStageiv); \ HookExtension(PFNGLPATCHPARAMETERIPROC, glPatchParameteri); \ + HookExtensionAlias(PFNGLPATCHPARAMETERIPROC, glPatchParameteri, glPatchParameteriEXT); \ + HookExtensionAlias(PFNGLPATCHPARAMETERIPROC, glPatchParameteri, glPatchParameteriOES); \ HookExtension(PFNGLPATCHPARAMETERFVPROC, glPatchParameterfv); \ HookExtension(PFNGLBINDTRANSFORMFEEDBACKPROC, glBindTransformFeedback); \ HookExtension(PFNGLDELETETRANSFORMFEEDBACKSPROC, glDeleteTransformFeedbacks); \