okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OpenGL2: Remove sRGB support, replace with gamma cvars.

Browse source
This commit is contained in:
SmileTheory 2014-04-16 05:26:03 -07:00
parent 880a7c6bec
commit 4fe69cb418
12 changed files with 214 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

15
code/renderergl2/tr_shader.c
View file

@ -685,9 +685,6 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
{
if (r_genNormalMaps->integer)
flags |= IMGFLAG_GENNORMALMAP;
if (r_srgb->integer)
flags |= IMGFLAG_SRGB;
}
stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
@ -732,9 +729,6 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
{
if (r_genNormalMaps->integer)
flags |= IMGFLAG_GENNORMALMAP;
if (r_srgb->integer)
flags |= IMGFLAG_SRGB;
}
@ -776,9 +770,6 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
if (!shader.noPicMip)
flags |= IMGFLAG_PICMIP;
if (r_srgb->integer)
flags |= IMGFLAG_SRGB;
stage->bundle[0].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
if ( !stage->bundle[0].image[num] )
{
@ -1511,9 +1502,6 @@ static void ParseSkyParms( char **text ) {
int i;
imgFlags_t imgFlags = IMGFLAG_MIPMAP | IMGFLAG_PICMIP;
if (r_srgb->integer)
imgFlags |= IMGFLAG_SRGB;
// outerbox
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 ) {
@ -3333,9 +3321,6 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
flags = IMGFLAG_NONE;
if (r_srgb->integer)
flags |= IMGFLAG_SRGB;
if (mipRawImage)
{
flags |= IMGFLAG_MIPMAP | IMGFLAG_PICMIP;