diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp index 22e7c5f3..284998c1 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp @@ -1513,13 +1513,12 @@ public: if (config.video.multisampling > 0) { m_part = "uniform lowp int uMSAASamples; \n" - "uniform lowp float uMSAAScale; \n" "lowp vec4 sampleMS(in lowp sampler2DMS mstex, in mediump ivec2 ipos) \n" "{ \n" " lowp vec4 texel = vec4(0.0); \n" " for (int i = 0; i < uMSAASamples; ++i) \n" " texel += texelFetch(mstex, ipos, i); \n" - " return texel * uMSAAScale; \n" + " return texel / float(uMSAASamples); \n" "} \n" " \n" "lowp vec4 readTexMS(in lowp sampler2DMS mstex, in mediump vec2 texCoord, in lowp int fbMonochrome, in lowp int fbFixedAlpha) \n" diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp index 30d7e349..0d1697ac 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp @@ -166,7 +166,6 @@ public: LocateUniform(uMSTex0); LocateUniform(uMSTex1); LocateUniform(uMSAASamples); - LocateUniform(uMSAAScale); } void update(bool _force) override @@ -174,14 +173,12 @@ public: uMSTex0.set(int(graphics::textureIndices::MSTex[0]), _force); uMSTex1.set(int(graphics::textureIndices::MSTex[1]), _force); uMSAASamples.set(config.video.multisampling, _force); - uMSAAScale.set(1.0f / (float)config.video.multisampling, _force); } private: iUniform uMSTex0; iUniform uMSTex1; iUniform uMSAASamples; - fUniform uMSAAScale; }; class UFrameBufferInfo : public UniformGroup