zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix setting of the gl_legacy_mode cvar.

Browse source
This commit is contained in:
svdijk 2017-06-05 11:41:54 +02:00 committed by Christoph Oelckers
parent 3b818171d5
commit c698f10257
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gl/system/gl_interface.cpp
View file

@ -324,7 +324,10 @@ void gl_LoadExtensions()
FUDGE_FUNC(glBindRenderbuffer, EXT); FUDGE_FUNC(glBindRenderbuffer, EXT);
FUDGE_FUNC(glCheckFramebufferStatus, EXT); FUDGE_FUNC(glCheckFramebufferStatus, EXT);
} }
gl_legacy_mode = gl.legacyMode;
UCVarValue value;
value.Bool = gl.legacyMode;
gl_legacy_mode.ForceSet (value, CVAR_Bool);
} }
//========================================================================== //==========================================================================

7
src/gl/system/gl_swframebuffer.cpp
View file

@ -207,12 +207,15 @@ OpenGLSWFrameBuffer::OpenGLSWFrameBuffer(void *hMonitor, int width, int height,
const char *glversion = (const char*)glGetString(GL_VERSION); const char *glversion = (const char*)glGetString(GL_VERSION);
bool isGLES = (glversion && strlen(glversion) > 10 && memcmp(glversion, "OpenGL ES ", 10) == 0); bool isGLES = (glversion && strlen(glversion) > 10 && memcmp(glversion, "OpenGL ES ", 10) == 0);
UCVarValue value;
// GL 3.0 is mostly broken on MESA drivers which really are the only relevant case here that doesn't fulfill the requirements based on version number alone. // GL 3.0 is mostly broken on MESA drivers which really are the only relevant case here that doesn't fulfill the requirements based on version number alone.
#ifdef _WIN32 #ifdef _WIN32
gl_legacy_mode = !ogl_IsVersionGEQ(3, 0); value.Bool = !ogl_IsVersionGEQ(3, 0);
#else #else
gl_legacy_mode = !ogl_IsVersionGEQ(3, 1); value.Bool = !ogl_IsVersionGEQ(3, 1);
#endif #endif
gl_legacy_mode.ForceSet (value, CVAR_Bool);
if (!isGLES && ogl_IsVersionGEQ(3, 0) == 0) if (!isGLES && ogl_IsVersionGEQ(3, 0) == 0)
{ {
Printf("OpenGL acceleration requires at least OpenGL 3.0. No Acceleration will be used.\n"); Printf("OpenGL acceleration requires at least OpenGL 3.0. No Acceleration will be used.\n");