From 3b1dd92118ed9543e345f9b4c2a98ca7ecc940d5 Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Mon, 30 Jan 2017 11:00:42 +0700 Subject: [PATCH] Correct TexrectCopyShader for GL versions that are not GLES 2.0 --- .../GLSL/glsl_SpecialShadersFactory.cpp | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_SpecialShadersFactory.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_SpecialShadersFactory.cpp index 97ef6976..d44cf3ef 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_SpecialShadersFactory.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_SpecialShadersFactory.cpp @@ -331,13 +331,13 @@ namespace glsl { TexrectCopy(const opengl::GLInfo & _glinfo) { m_part = - "IN mediump vec2 vTexCoord0; \n" - "uniform sampler2D uTex0; \n" - " \n" - "void main() \n" - "{ \n" - " gl_FragColor = texture2D(uTex0, vTexCoord0); \n" - "} \n" + "IN mediump vec2 vTexCoord0; \n" + "uniform sampler2D uTex0; \n" + "OUT lowp vec4 fragColor; \n" + " \n" + "void main() \n" + "{ \n" + " fragColor = texture2D(uTex0, vTexCoord0); \n" ; } }; @@ -574,8 +574,9 @@ namespace glsl { TexrectCopyShader(const opengl::GLInfo & _glinfo, opengl::CachedUseProgram * _useProgram, const ShaderPart * _vertexHeader, - const ShaderPart * _fragmentHeader) - : TexrectCopyShaderBase(_glinfo, _useProgram, _vertexHeader, _fragmentHeader) + const ShaderPart * _fragmentHeader, + const ShaderPart * _fragmentEnd) + : TexrectCopyShaderBase(_glinfo, _useProgram, _vertexHeader, _fragmentHeader, _fragmentEnd) { m_useProgram->useProgram(m_program); const int texLoc = glGetUniformLocation(GLuint(m_program), "uTex0"); @@ -668,7 +669,7 @@ namespace glsl { graphics::ShaderProgram * SpecialShadersFactory::createTexrectCopyShader() const { - return new TexrectCopyShader(m_glinfo, m_useProgram, m_vertexHeader, m_fragmentHeader); + return new TexrectCopyShader(m_glinfo, m_useProgram, m_vertexHeader, m_fragmentHeader, m_fragmentEnd); } graphics::ShaderProgram * SpecialShadersFactory::createGammaCorrectionShader() const