From f93b0d6fb7bebb15847f2b4cd88be4354fbf0559 Mon Sep 17 00:00:00 2001 From: babymustgrowstrong Date: Sat, 13 May 2017 14:13:08 -0700 Subject: [PATCH] GL_OES_copy_image and GL_EXT_copy_image support --- renderdoc/driver/gl/gl_driver.cpp | 2 ++ renderdoc/driver/gl/gl_hookset.h | 2 +- renderdoc/driver/gl/gl_hookset_defs.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index aa67ea853..e8afc7f66 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -731,6 +731,7 @@ void WrappedOpenGL::BuildGLESExtensions() m_GLESExtensions.push_back("GL_KHR_texture_compression_astc_ldr"); m_GLESExtensions.push_back("GL_KHR_blend_equation_advanced_coherent"); + m_GLESExtensions.push_back("GL_OES_copy_image"); m_GLESExtensions.push_back("GL_OES_gpu_shader5"); m_GLESExtensions.push_back("GL_OES_rgb8_rgba8"); m_GLESExtensions.push_back("GL_OES_mapbuffer"); @@ -742,6 +743,7 @@ void WrappedOpenGL::BuildGLESExtensions() m_GLESExtensions.push_back("GL_OES_texture_half_float"); m_GLESExtensions.push_back("GL_OES_texture_half_float_linear"); + m_GLESExtensions.push_back("GL_EXT_copy_image"); m_GLESExtensions.push_back("GL_EXT_geometry_point_size"); m_GLESExtensions.push_back("GL_EXT_geometry_shader"); m_GLESExtensions.push_back("GL_EXT_sRGB"); diff --git a/renderdoc/driver/gl/gl_hookset.h b/renderdoc/driver/gl/gl_hookset.h index 3d6abd42e..8a955bf6e 100644 --- a/renderdoc/driver/gl/gl_hookset.h +++ b/renderdoc/driver/gl/gl_hookset.h @@ -129,7 +129,7 @@ struct GLHookSet PFNGLTEXPARAMETERIIVPROC glTexParameterIiv; // aliases glTexParameterIivEXT PFNGLTEXPARAMETERIUIVPROC glTexParameterIuiv; // aliases glTexParameterIuivEXT PFNGLGENERATEMIPMAPPROC glGenerateMipmap; // aliases glGenerateMipmapEXT - PFNGLCOPYIMAGESUBDATAPROC glCopyImageSubData; + PFNGLCOPYIMAGESUBDATAPROC glCopyImageSubData; // aliases glCopyImageSubDataEXT, glCopyImageSubDataOES PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D; PFNGLGETINTERNALFORMATIVPROC glGetInternalformativ; PFNGLGETINTERNALFORMATI64VPROC glGetInternalformati64v; diff --git a/renderdoc/driver/gl/gl_hookset_defs.h b/renderdoc/driver/gl/gl_hookset_defs.h index 70eec811d..7113f8cd4 100644 --- a/renderdoc/driver/gl/gl_hookset_defs.h +++ b/renderdoc/driver/gl/gl_hookset_defs.h @@ -769,6 +769,8 @@ HookExtension(PFNGLDISPATCHCOMPUTEPROC, glDispatchCompute); \ HookExtension(PFNGLDISPATCHCOMPUTEINDIRECTPROC, glDispatchComputeIndirect); \ HookExtension(PFNGLCOPYIMAGESUBDATAPROC, glCopyImageSubData); \ + HookExtensionAlias(PFNGLCOPYIMAGESUBDATAPROC, glCopyImageSubData, glCopyImageSubDataEXT); \ + HookExtensionAlias(PFNGLCOPYIMAGESUBDATAPROC, glCopyImageSubData, glCopyImageSubDataOES); \ HookExtension(PFNGLFRAMEBUFFERPARAMETERIPROC, glFramebufferParameteri); \ HookExtension(PFNGLGETFRAMEBUFFERPARAMETERIVPROC, glGetFramebufferParameteriv); \ HookExtension(PFNGLGETINTERNALFORMATI64VPROC, glGetInternalformati64v); \