Workaround (two, actually) for the hardware gamma bug in 8-bit fullscreen with

ATI cards.
From the time of OpenGL initialization, gamma lookup in classic/fullscreen
will be done in software. Before that, always do a setgamma() after setting the
palette, since this is what resets the HW gamma. However, this may lead to
unappealing artifacts with portions of the scene being sent to the screen with
different gammas.

git-svn-id: https://svn.eduke32.com/eduke32@2085 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-10-27 13:14:22 +00:00
parent 53a670e1f0
commit 35a151d2cd

View file

@ -40,6 +40,8 @@
#define ANY_WINDOWED_SIZE #define ANY_WINDOWED_SIZE
static mutex_t m_initprintf; static mutex_t m_initprintf;
static int32_t winlayer_uselastgamma = -1;
static int32_t winlayer_have_ATI = 0;
int32_t _buildargc = 0; int32_t _buildargc = 0;
const char **_buildargv = NULL; const char **_buildargv = NULL;
@ -2160,6 +2162,13 @@ int32_t setpalette(int32_t start, int32_t num)
return -1; return -1;
} }
if (winlayer_have_ATI)
{
winlayer_uselastgamma = (winlayer_uselastgamma!=-1);
setgamma();
winlayer_uselastgamma = 0;
}
return 0; return 0;
} }
@ -2242,13 +2251,14 @@ static int32_t setgammaramp(WORD gt[3][256])
IDirectDrawGammaControl_Release(gam); IDirectDrawGammaControl_Release(gam);
return 0; return 0;
} }
else return 0;
return 0;
} }
int32_t setgamma(void) int32_t setgamma(void)
{ {
int32_t i; int32_t i;
WORD gammaTable[3][256]; static WORD gammaTable[3][256];
float gamma = max(0.1f,min(4.f,vid_gamma)); float gamma = max(0.1f,min(4.f,vid_gamma));
float contrast = max(0.1f,min(3.f,vid_contrast)); float contrast = max(0.1f,min(3.f,vid_contrast));
float bright = max(-0.8f,min(0.8f,vid_brightness)); float bright = max(-0.8f,min(0.8f,vid_brightness));
@ -2258,8 +2268,12 @@ int32_t setgamma(void)
if (!hWindow) return -1; if (!hWindow) return -1;
if (winlayer_have_ATI && bpp==8 && fullscreen)
return -1;
// This formula is taken from Doomsday // This formula is taken from Doomsday
if (!winlayer_uselastgamma)
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
{ {
double val = i * contrast - (contrast - 1) * 127; double val = i * contrast - (contrast - 1) * 127;
@ -2886,6 +2900,7 @@ static int32_t SetupOpenGL(int32_t width, int32_t height, int32_t bitspp)
{ {
if (!Bstrcmp(glinfo.vendor,"ATI Technologies Inc.")) if (!Bstrcmp(glinfo.vendor,"ATI Technologies Inc."))
{ {
winlayer_have_ATI = 1;
#ifdef POLYMER #ifdef POLYMER
pr_ati_fboworkaround = 1; pr_ati_fboworkaround = 1;
initprintf("Enabling ATI FBO color attachment workaround.\n"); initprintf("Enabling ATI FBO color attachment workaround.\n");