MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00
Code Issues Projects Releases Wiki Activity

Remove uMSAAScale uniform.

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-02-19 21:14:42 +07:00
parent 5d0ea0a6f5
commit b5652e3309
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp
View File

@ -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"

3
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp
View File

@ -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