mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-07 03:13:49 +00:00
Put UTextureFilterMode uniform creation to the right place.
This commit is contained in:
parent
c5c0fbeb6f
commit
7d1d3da114
|
@ -815,6 +815,8 @@ void CombinerProgramUniformFactory::buildUniforms(GLuint _program,
|
||||||
_uniforms.emplace_back(new UMipmap1(_program));
|
_uniforms.emplace_back(new UMipmap1(_program));
|
||||||
if (config.generalEmulation.enableLOD != 0)
|
if (config.generalEmulation.enableLOD != 0)
|
||||||
_uniforms.emplace_back(new UMipmap2(_program));
|
_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));
|
_uniforms.emplace_back(new UTexturePersp(_program));
|
||||||
|
@ -824,6 +826,7 @@ void CombinerProgramUniformFactory::buildUniforms(GLuint _program,
|
||||||
|
|
||||||
if (!_key.isRectKey())
|
if (!_key.isRectKey())
|
||||||
_uniforms.emplace_back(new UTextureParams(_program, _inputs.usesTile(0), _inputs.usesTile(1)));
|
_uniforms.emplace_back(new UTextureParams(_program, _inputs.usesTile(0), _inputs.usesTile(1)));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_uniforms.emplace_back(new UFog(_program));
|
_uniforms.emplace_back(new UFog(_program));
|
||||||
|
@ -843,9 +846,6 @@ void CombinerProgramUniformFactory::buildUniforms(GLuint _program,
|
||||||
|
|
||||||
_uniforms.emplace_back(new UScreenScale(_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));
|
_uniforms.emplace_back(new UAlphaTestInfo(_program));
|
||||||
|
|
||||||
if (config.frameBufferEmulation.N64DepthCompare != 0)
|
if (config.frameBufferEmulation.N64DepthCompare != 0)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user