From 992311c2daf23da3e41ec5b0458b8e2ad0fbb674 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 14 Jan 2019 13:18:43 +0000 Subject: [PATCH] Fix shader compilation for triangle size overlay program --- renderdoc/driver/gl/gl_debug.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp index b2f4d3262..c5985199e 100644 --- a/renderdoc/driver/gl/gl_debug.cpp +++ b/renderdoc/driver/gl/gl_debug.cpp @@ -335,21 +335,19 @@ void GLReplay::InitDebugData() if(HasExt[ARB_geometry_shader4]) { GenerateGLSLShader(vs, shaderType, "", GetEmbeddedResource(glsl_mesh_vert), glslBaseVer); + GenerateGLSLShader(fs, shaderType, "", GetEmbeddedResource(glsl_trisize_frag), glslBaseVer); + GenerateGLSLShader(gs, shaderType, "", GetEmbeddedResource(glsl_trisize_geom), glslBaseVer); + + DebugData.trisizeProg = CreateShaderProgram(vs, fs, gs); + GenerateGLSLShader(fs, shaderType, "", GetEmbeddedResource(glsl_mesh_frag), glslBaseVer); GenerateGLSLShader(gs, shaderType, "", GetEmbeddedResource(glsl_mesh_geom), glslBaseVer); DebugData.meshProg[0] = CreateShaderProgram(vs, fs); DebugData.meshgsProg[0] = CreateShaderProgram(vs, fs, gs); - GenerateGLSLShader(fs, shaderType, "", GetEmbeddedResource(glsl_trisize_frag), glslBaseVer); - GenerateGLSLShader(gs, shaderType, "", GetEmbeddedResource(glsl_trisize_geom), glslBaseVer); - - DebugData.trisizeProg = CreateShaderProgram(vs, fs, gs); - if(HasExt[ARB_gpu_shader_fp64] && HasExt[ARB_vertex_attrib_64bit]) { - GenerateGLSLShader(fs, shaderType, "", GetEmbeddedResource(glsl_mesh_frag), glslBaseVer); - std::string extensions = "#extension GL_ARB_gpu_shader_fp64 : require\n" "#extension GL_ARB_vertex_attrib_64bit : require\n";