ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-11-10 06:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused imgFlag_t value IMGFLAG_SRGB

Browse source
This commit is contained in:
Zack Middleton 2017-07-30 15:39:32 -05:00
parent 39716745f9
commit e62941396d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/renderercommon/tr_common.h
View file

@ -43,8 +43,7 @@ typedef enum
IMGFLAG_NO_COMPRESSION = 0x0010, IMGFLAG_NO_COMPRESSION = 0x0010,
IMGFLAG_NOLIGHTSCALE = 0x0020, IMGFLAG_NOLIGHTSCALE = 0x0020,
IMGFLAG_CLAMPTOEDGE = 0x0040, IMGFLAG_CLAMPTOEDGE = 0x0040,
IMGFLAG_SRGB = 0x0080, IMGFLAG_GENNORMALMAP = 0x0080,
IMGFLAG_GENNORMALMAP = 0x0100,
} imgFlags_t; } imgFlags_t;
typedef struct image_s { typedef struct image_s {

4
code/renderergl2/tr_shader.c
View file

@ -2255,7 +2255,7 @@ static void CollapseStagesToLightall(shaderStage_t *diffuse,
{ {
char normalName[MAX_QPATH]; char normalName[MAX_QPATH];
image_t *normalImg; image_t *normalImg;
imgFlags_t normalFlags = (diffuseImg->flags & ~(IMGFLAG_GENNORMALMAP | IMGFLAG_SRGB)) | IMGFLAG_NOLIGHTSCALE; imgFlags_t normalFlags = (diffuseImg->flags & ~IMGFLAG_GENNORMALMAP) | IMGFLAG_NOLIGHTSCALE;
// try a normalheight image first // try a normalheight image first
COM_StripExtension(diffuseImg->imgName, normalName, MAX_QPATH); COM_StripExtension(diffuseImg->imgName, normalName, MAX_QPATH);
@ -2301,7 +2301,7 @@ static void CollapseStagesToLightall(shaderStage_t *diffuse,
{ {
char specularName[MAX_QPATH]; char specularName[MAX_QPATH];
image_t *specularImg; image_t *specularImg;
imgFlags_t specularFlags = (diffuseImg->flags & ~(IMGFLAG_GENNORMALMAP | IMGFLAG_SRGB)) | IMGFLAG_NOLIGHTSCALE; imgFlags_t specularFlags = (diffuseImg->flags & ~IMGFLAG_GENNORMALMAP) | IMGFLAG_NOLIGHTSCALE;
COM_StripExtension(diffuseImg->imgName, specularName, MAX_QPATH); COM_StripExtension(diffuseImg->imgName, specularName, MAX_QPATH);
Q_strcat(specularName, MAX_QPATH, "_s"); Q_strcat(specularName, MAX_QPATH, "_s");