don't try using sw gamma if hw gamma is enabled.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@585 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
f879422fb7
commit
719a42f98e
1 changed files with 41 additions and 16 deletions
|
@ -858,24 +858,49 @@ void GLVID_SetPalette (unsigned char *palette)
|
||||||
unsigned *table;
|
unsigned *table;
|
||||||
extern qbyte gammatable[256];
|
extern qbyte gammatable[256];
|
||||||
|
|
||||||
//
|
//
|
||||||
// 8 8 8 encoding
|
// 8 8 8 encoding
|
||||||
//
|
//
|
||||||
pal = palette;
|
if (vid_hardwaregamma.value)
|
||||||
table = d_8to24rgbtable;
|
|
||||||
for (i=0 ; i<256 ; i++)
|
|
||||||
{
|
{
|
||||||
r = gammatable[pal[0]];
|
// don't built in the gamma table
|
||||||
g = gammatable[pal[1]];
|
|
||||||
b = gammatable[pal[2]];
|
pal = palette;
|
||||||
pal += 3;
|
table = d_8to24rgbtable;
|
||||||
|
for (i=0 ; i<256 ; i++)
|
||||||
// v = (255<<24) + (r<<16) + (g<<8) + (b<<0);
|
{
|
||||||
// v = (255<<0) + (r<<8) + (g<<16) + (b<<24);
|
r = pal[0];
|
||||||
v = (255<<24) + (r<<0) + (g<<8) + (b<<16);
|
g = pal[1];
|
||||||
*table++ = v;
|
b = pal[2];
|
||||||
|
pal += 3;
|
||||||
|
|
||||||
|
// v = (255<<24) + (r<<16) + (g<<8) + (b<<0);
|
||||||
|
// v = (255<<0) + (r<<8) + (g<<16) + (b<<24);
|
||||||
|
v = (255<<24) + (r<<0) + (g<<8) + (b<<16);
|
||||||
|
*table++ = v;
|
||||||
|
}
|
||||||
|
d_8to24rgbtable[255] &= 0xffffff; // 255 is transparent
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//computer has no hardware gamma (poor suckers) increase table accordingly
|
||||||
|
|
||||||
|
pal = palette;
|
||||||
|
table = d_8to24rgbtable;
|
||||||
|
for (i=0 ; i<256 ; i++)
|
||||||
|
{
|
||||||
|
r = gammatable[pal[0]];
|
||||||
|
g = gammatable[pal[1]];
|
||||||
|
b = gammatable[pal[2]];
|
||||||
|
pal += 3;
|
||||||
|
|
||||||
|
// v = (255<<24) + (r<<16) + (g<<8) + (b<<0);
|
||||||
|
// v = (255<<0) + (r<<8) + (g<<16) + (b<<24);
|
||||||
|
v = (255<<24) + (r<<0) + (g<<8) + (b<<16);
|
||||||
|
*table++ = v;
|
||||||
|
}
|
||||||
|
d_8to24rgbtable[255] &= 0xffffff; // 255 is transparent
|
||||||
}
|
}
|
||||||
d_8to24rgbtable[255] &= 0xffffff; // 255 is transparent
|
|
||||||
}
|
}
|
||||||
|
|
||||||
extern gammaworks;
|
extern gammaworks;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue