From 0255e1391244f70fc7b0a81dc133638f2cab745a Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 3 Sep 2013 17:36:55 +0200 Subject: [PATCH] ogl: disable revision 737df2a68cd5 for desktop ogl texelFetch doesn't filter linear, so every copy with filters didn't work correctly. This is still the case for gles, but this will be fixed after the 4.0 release. Fixes issue 6465. --- Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h | 5 +---- Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h index 5da16a818e..5b0d66f7f6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h @@ -60,10 +60,7 @@ struct XFBSource : public XFBSourceBase inline GLenum getFbType() { #ifndef USE_GLES3 - if(g_ogl_config.eSupportedGLSLVersion == GLSL_120) - { - return GL_TEXTURE_RECTANGLE; - } + return GL_TEXTURE_RECTANGLE; #endif return GL_TEXTURE_2D; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index 95c5c3f46d..b99b112f2f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -566,9 +566,9 @@ void ProgramShaderCache::CreateHeader ( void ) , v==GLSL_120 ? "#define ocol1 gl_FragColor" : "" //TODO: implement dual source blend , v==GLSL_120 ? "" : "out vec4 name;" - , v==GLSL_120 ? "#extension GL_ARB_texture_rectangle : enable" : "" - , v==GLSL_120 ? "" : "#define texture2DRect(samp, uv) texelFetch(samp, ivec2(floor(uv)), 0)" - , v==GLSL_120 ? "" : "#define sampler2DRect sampler2D" + , v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture" + , v==GLSLES3 ? "#define texture2DRect(samp, uv) texelFetch(samp, ivec2(floor(uv)), 0)" : "" + , v==GLSLES3 ? "#define sampler2DRect sampler2D" : "" ); }