From 737df2a68cd5c5cdfa1e73cede0dbf85bde01abc Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 13 Jul 2013 17:24:23 -0500 Subject: Patch from Degasus that removes the last of the the GL_TEXTURE_RECTANGLE usages. This is needed to have GLES3 support. --- Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp') diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index 1da28f9cc5..1eed65a01e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -509,7 +509,6 @@ void ProgramShaderCache::CreateHeader ( void ) snprintf(s_glsl_header, sizeof(s_glsl_header), "#version %s\n" "%s\n" // default precision - "%s\n" // tex_rect "%s\n" // ubo "\n"// A few required defines and ones that will make our lives a lot easier @@ -534,10 +533,14 @@ void ProgramShaderCache::CreateHeader ( void ) "%s\n" "%s\n" "#define COLOROUT(name) %s\n" + + // texture2d hack + "%s\n" + "%s\n" + "%s\n" , v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140" , v==GLSLES3 ? "precision highp float;" : "" - , v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture" , g_ActiveConfig.backend_info.bSupportsGLSLUBO && v