From 528fa085b4e8cb620ea4f45b8aeacaee74b42392 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 13 Feb 2018 19:34:27 +0000 Subject: [PATCH] On ES when declaring a #version 100 shader, don't append the 'es' suffix --- renderdoc/data/glsl_shaders.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp index 01db3f4e6..53b71a68a 100644 --- a/renderdoc/data/glsl_shaders.cpp +++ b/renderdoc/data/glsl_shaders.cpp @@ -30,8 +30,17 @@ void GenerateGLSLShader(std::vector &sources, ShaderType type, bool uniforms) { sources.resize(4); - sources[0] = - StringFormat::Fmt("#version %d %s\n", version, type == eShaderGLSLES ? "es" : "core"); + if(type == eShaderGLSLES) + { + if(version == 100) + sources[0] = "#version 100"; // no es suffix + else + sources[0] = StringFormat::Fmt("#version %d es\n", version); + } + else + { + sources[0] = StringFormat::Fmt("#version %d core\n", version); + } if(uniforms) sources[1] = GetEmbeddedResource(glsl_debuguniforms_h);