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

Put UTextureFilterMode uniform creation to the right place.

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-10-29 15:10:53 +07:00
parent c5c0fbeb6f
commit 7d1d3da114
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -815,6 +815,8 @@ void CombinerProgramUniformFactory::buildUniforms(GLuint _program,
_uniforms.emplace_back(new UMipmap1(_program));
if (config.generalEmulation.enableLOD != 0)
_uniforms.emplace_back(new UMipmap2(_program));
} else if (config.texture.bilinearMode == BILINEAR_3POINT) {
_uniforms.emplace_back(new UTextureFilterMode(_program));
}
_uniforms.emplace_back(new UTexturePersp(_program));
@ -824,6 +826,7 @@ void CombinerProgramUniformFactory::buildUniforms(GLuint _program,
if (!_key.isRectKey())
_uniforms.emplace_back(new UTextureParams(_program, _inputs.usesTile(0), _inputs.usesTile(1)));
}
_uniforms.emplace_back(new UFog(_program));
@ -843,9 +846,6 @@ void CombinerProgramUniformFactory::buildUniforms(GLuint _program,
_uniforms.emplace_back(new UScreenScale(_program));
if (config.texture.bilinearMode == BILINEAR_3POINT)
_uniforms.emplace_back(new UTextureFilterMode(_program));
_uniforms.emplace_back(new UAlphaTestInfo(_program));
if (config.frameBufferEmulation.N64DepthCompare != 0)