mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-03-15 07:00:58 +00:00
Disabled usage of OpenGL 3.2 compatibility profiles for Linux #187
This commit is contained in:
parent
6a906704c5
commit
d295a6aea9
2 changed files with 11 additions and 7 deletions
|
@ -437,7 +437,7 @@ static void R_CheckPortableExtensions()
|
|||
}
|
||||
}
|
||||
// RB: make GPU skinning optional for weak OpenGL drivers
|
||||
glConfig.gpuSkinningAvailable = glConfig.uniformBufferAvailable && ( glConfig.driverType == GLDRV_OPENGL3X || glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE || glConfig.driverType == GLDRV_OPENGL32_COMPATIBILITY_PROFILE );
|
||||
glConfig.gpuSkinningAvailable = glConfig.uniformBufferAvailable && ( glConfig.driverType == GLDRV_OPENGL3X || glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE || glConfig.driverType == GLDRV_OPENGL32_COMPATIBILITY_PROFILE || GLEW_ARB_ES3_compatibility != 0 );
|
||||
|
||||
// ATI_separate_stencil / OpenGL 2.0 separate stencil
|
||||
glConfig.twoSidedStencilAvailable = ( glConfig.glVersion >= 2.0f ) || GLEW_ATI_separate_stencil != 0;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
Doom 3 GPL Source Code
|
||||
Copyright (C) 1999-2011 id Software LLC, a ZeniMax Media company.
|
||||
Copyright (C) 2012 dhewg (dhewm3)
|
||||
Copyright (C) 2012 Robert Beckebans
|
||||
Copyright (C) 2012-2014 Robert Beckebans
|
||||
Copyright (C) 2013 Daniel Gibson
|
||||
|
||||
This file is part of the Doom 3 GPL Source Code ("Doom 3 Source Code").
|
||||
|
@ -49,7 +49,15 @@ idCVar in_nograb( "in_nograb", "0", CVAR_SYSTEM | CVAR_NOCHEAT, "prevents input
|
|||
idCVar r_waylandcompat( "r_waylandcompat", "0", CVAR_SYSTEM | CVAR_NOCHEAT | CVAR_ARCHIVE, "wayland compatible framebuffer" );
|
||||
|
||||
// RB: only relevant if using SDL 2.0
|
||||
idCVar r_useOpenGL32( "r_useOpenGL32", "1", CVAR_INTEGER, "0 = OpenGL 2.0, 1 = OpenGL 3.2 compatibility profile, 2 = OpenGL 3.2 core profile", 0, 2 );
|
||||
#if defined(__APPLE__)
|
||||
// only core profile is supported on OS X
|
||||
idCVar r_useOpenGL32( "r_useOpenGL32", "2", CVAR_INTEGER, "0 = OpenGL 3.x, 1 = OpenGL 3.2 compatibility profile, 2 = OpenGL 3.2 core profile", 0, 2 );
|
||||
#elif defined(__linux__)
|
||||
// Linux open source drivers suck
|
||||
idCVar r_useOpenGL32( "r_useOpenGL32", "0", CVAR_INTEGER, "0 = OpenGL 3.x, 1 = OpenGL 3.2 compatibility profile, 2 = OpenGL 3.2 core profile", 0, 2 );
|
||||
#else
|
||||
idCVar r_useOpenGL32( "r_useOpenGL32", "1", CVAR_INTEGER, "0 = OpenGL 3.x, 1 = OpenGL 3.2 compatibility profile, 2 = OpenGL 3.2 core profile", 0, 2 );
|
||||
#endif
|
||||
// RB end
|
||||
|
||||
static bool grabbed = false;
|
||||
|
@ -187,10 +195,6 @@ bool GLimp_Init( glimpParms_t parms )
|
|||
|
||||
#if SDL_VERSION_ATLEAST(2, 0, 0)
|
||||
|
||||
#ifdef __APPLE__
|
||||
r_useOpenGL32.SetInteger( 2 ); // only core profile is supported on OS X
|
||||
#endif
|
||||
|
||||
// RB begin
|
||||
if( r_useOpenGL32.GetInteger() > 0 )
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue