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

OPENGL: Simplify shader support checks.

Browse source
This commit is contained in:
Johannes Schickel 2016-01-03 12:50:51 +01:00
parent 397ce9b947
commit 18306ee206
2 changed files with 5 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -773,8 +773,7 @@ void OpenGLGraphicsManager::setActualScreenSize(uint width, uint height) {
};
#if !USE_FORCED_GL && !USE_FORCED_GLES && !USE_FORCED_GLES2
if (g_context.type == kContextGLES
|| (g_context.type == kContextGL && !g_context.shadersSupported)) {
if (!g_context.shadersSupported) {
#endif
#if !USE_FORCED_GLES2
GL_CALL(glMatrixMode(GL_PROJECTION));
@ -901,23 +900,9 @@ void OpenGLGraphicsManager::notifyContextCreate(const Graphics::PixelFormat &def
#if !USE_FORCED_GLES
if (!_shader) {
#if !USE_FORCED_GL && !USE_FORCED_GLES2
if (g_context.type == kContextGLES2) {
#endif
#if !USE_FORCED_GL
if (g_context.shadersSupported) {
_shader = new Shader(g_defaultVertexShader, g_defaultFragmentShader);
#endif
#if !USE_FORCED_GL && !USE_FORCED_GLES2
} else {
#endif
#if !USE_FORCED_GLES2
if (g_context.shadersSupported) {
_shader = new Shader(g_defaultVertexShader, g_defaultFragmentShader);
}
#endif
#if !USE_FORCED_GL && !USE_FORCED_GLES2
}
#endif
}
#endif