thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Let Shader store the uniform state.

Browse source
This commit is contained in:
Johannes Schickel 2016-03-02 15:16:05 +01:00
parent 6dacc96d1f
commit baca885cfc
6 changed files with 211 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/graphics/opengl/pipelines/clut8.cpp
View file

@ -32,8 +32,6 @@ CLUT8LookUpPipeline::CLUT8LookUpPipeline()
}
void CLUT8LookUpPipeline::drawTexture(const GLTexture &texture, const GLfloat *coordinates) {
_activeShader->setUniformI(_activeShader->getUniformLocation("palette"), 1);
// Set the palette texture.
GL_CALL(glActiveTexture(GL_TEXTURE1));
if (_paletteTexture) {