diff options
Diffstat (limited to 'src/rend2/tr_image.c')
| -rw-r--r-- | src/rend2/tr_image.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/rend2/tr_image.c b/src/rend2/tr_image.c index eaf133b4..c00bfbbc 100644 --- a/src/rend2/tr_image.c +++ b/src/rend2/tr_image.c @@ -2943,6 +2943,7 @@ void R_CreateBuiltinImages( void ) { tr.godRaysImage = R_CreateImage("*godRays", NULL, width, height, IMGTYPE_COLORALPHA, IMGFLAG_NO_COMPRESSION | IMGFLAG_CLAMPTOEDGE, GL_RGBA8); #endif + if (r_softOverbright->integer) { int format; @@ -3033,14 +3034,14 @@ void R_SetColorMappings( void ) { tr.overbrightBits = 0; // need hardware gamma for overbright } - // never overbright in windowed mode - if ( 0 /* !glConfig.isFullscreen */ ) + // never overbright in windowed mode without soft overbright + if ( !glConfig.isFullscreen && !r_softOverbright->integer ) { tr.overbrightBits = 0; } // never overbright with tonemapping - if ( r_toneMap->integer ) + if ( r_toneMap->integer && r_hdr->integer ) { tr.overbrightBits = 0; } @@ -3077,8 +3078,11 @@ void R_SetColorMappings( void ) { shift = tr.overbrightBits; - if (glRefConfig.framebufferObject) + // no shift with soft overbright + if (r_softOverbright->integer) + { shift = 0; + } for ( i = 0; i < 256; i++ ) { if ( g == 1 ) { |