From 9280538feafe4a542b6efdec2b229491cd91987c Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 17 Oct 2018 15:46:26 +0100 Subject: [PATCH] Don't declare GL_ARB_compute_shader extension on GLES --- renderdoc/driver/gl/gl_debug.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp index a87e5f071..5e47d7eda 100644 --- a/renderdoc/driver/gl/gl_debug.cpp +++ b/renderdoc/driver/gl/gl_debug.cpp @@ -434,10 +434,14 @@ void GLReplay::InitDebugData() ARRAY_COUNT(DebugData.minmaxTileProgram) >= (TEXDISPLAY_SINT_TEX | TEXDISPLAY_TYPEMASK) + 1, "not enough programs"); - string extensions = "#extension GL_ARB_compute_shader : require\n"; + string extensions; if(!IsGLES) - extensions += "#extension GL_ARB_shader_storage_buffer_object : require\n"; + { + extensions = + "#extension GL_ARB_compute_shader : require\n" + "#extension GL_ARB_shader_storage_buffer_object : require"; + } if(HasExt[ARB_compute_shader] && HasExt[ARB_shader_storage_buffer_object]) { @@ -565,10 +569,14 @@ void GLReplay::InitDebugData() if(HasExt[ARB_compute_shader]) { - string defines = "#extension GL_ARB_compute_shader : require\n"; + string defines; if(!IsGLES) - defines += "#extension GL_ARB_shader_storage_buffer_object : require"; + { + defines = + "#extension GL_ARB_compute_shader : require\n" + "#extension GL_ARB_shader_storage_buffer_object : require"; + } GenerateGLSLShader(cs, shaderType, defines, GetEmbeddedResource(glsl_mesh_comp), glslCSVer); DebugData.meshPickProgram = CreateCShaderProgram(cs); }