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

OPENGL: Make shader pipelines use fixed shaders.

Browse source
This commit is contained in:
Johannes Schickel 2016-02-29 00:04:33 +01:00
parent 26f106497a
commit 3f9852eb20
6 changed files with 10 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backends/graphics/opengl/opengl-graphics.cpp
View file

@ -851,7 +851,8 @@ void OpenGLGraphicsManager::notifyContextCreate(const Graphics::PixelFormat &def
#if !USE_FORCED_GLES
if (g_context.shadersSupported) {
_pipeline = new ShaderPipeline();
ShaderMan.notifyCreate();
_pipeline = new ShaderPipeline(ShaderMan.query(ShaderManager::kDefault));
}
#endif
@ -863,13 +864,6 @@ void OpenGLGraphicsManager::notifyContextCreate(const Graphics::PixelFormat &def
g_context.setPipeline(_pipeline);
#if !USE_FORCED_GLES
if (g_context.shadersSupported) {
ShaderMan.notifyCreate();
g_context.getActivePipeline()->setShader(ShaderMan.query(ShaderManager::kDefault));
}
#endif
// Disable 3D properties.
GL_CALL(glDisable(GL_CULL_FACE));
GL_CALL(glDisable(GL_DEPTH_TEST));