diff options
| author | Johannes Schickel | 2016-02-29 00:04:33 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-03-16 20:29:31 +0100 |
| commit | 3f9852eb202b55b93f6e3121ce473951bff033cd (patch) | |
| tree | 81b0b954eddec39f4e6c6ce052126d53dfaee224 /backends/graphics/opengl/pipelines/clut8.cpp | |
| parent | 26f106497a863b84c502d122b5ba749176b2c426 (diff) | |
| download | scummvm-rg350-3f9852eb202b55b93f6e3121ce473951bff033cd.tar.gz scummvm-rg350-3f9852eb202b55b93f6e3121ce473951bff033cd.tar.bz2 scummvm-rg350-3f9852eb202b55b93f6e3121ce473951bff033cd.zip | |
OPENGL: Make shader pipelines use fixed shaders.
Diffstat (limited to 'backends/graphics/opengl/pipelines/clut8.cpp')
| -rw-r--r-- | backends/graphics/opengl/pipelines/clut8.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/backends/graphics/opengl/pipelines/clut8.cpp b/backends/graphics/opengl/pipelines/clut8.cpp index 69dd0a3e28..9f2aa94b90 100644 --- a/backends/graphics/opengl/pipelines/clut8.cpp +++ b/backends/graphics/opengl/pipelines/clut8.cpp @@ -28,12 +28,7 @@ namespace OpenGL { #if !USE_FORCED_GLES CLUT8LookUpPipeline::CLUT8LookUpPipeline() - : _paletteTexture(nullptr) { - ShaderPipeline::setShader(ShaderMan.query(ShaderManager::kCLUT8LookUp)); -} - -Shader *CLUT8LookUpPipeline::setShader(Shader *shader) { - return ShaderPipeline::setShader(ShaderMan.query(ShaderManager::kCLUT8LookUp)); + : ShaderPipeline(ShaderMan.query(ShaderManager::kCLUT8LookUp)), _paletteTexture(nullptr) { } void CLUT8LookUpPipeline::drawTexture(const GLTexture &texture, const GLfloat *coordinates) { |