r_ignorehwgamma 1 does not actually turn on software gamma (#5511) - patch by Serge Belyshev

This commit is contained in:
Thilo Schulz 2012-07-01 17:01:30 +00:00
parent c9fc250532
commit 1af9c636a5
2 changed files with 7 additions and 1 deletions

View File

@ -39,7 +39,7 @@ void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned
Uint16 table[3][256];
int i, j;
if( !glConfig.deviceSupportsGamma || r_ignorehwgamma->integer )
if( !glConfig.deviceSupportsGamma || r_ignorehwgamma->integer > 0 )
return;
for (i = 0; i < 256; i++)

View File

@ -733,6 +733,12 @@ success:
// http://bugzilla.icculus.org/show_bug.cgi?id=4316
glConfig.deviceSupportsGamma = SDL_SetGamma( 1.0f, 1.0f, 1.0f ) >= 0;
if ( -1 == r_ignorehwgamma->integer)
glConfig.deviceSupportsGamma = 1;
if ( 1 == r_ignorehwgamma->integer)
glConfig.deviceSupportsGamma = 0;
// get our config strings
Q_strncpyz( glConfig.vendor_string, (char *) qglGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) );
Q_strncpyz( glConfig.renderer_string, (char *) qglGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) );