From e62941396d852a7e96484f2ce10aed5b2e8a77f4 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 30 Jul 2017 15:39:32 -0500 Subject: [PATCH] Remove unused imgFlag_t value IMGFLAG_SRGB --- code/renderercommon/tr_common.h | 3 +-- code/renderergl2/tr_shader.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/renderercommon/tr_common.h b/code/renderercommon/tr_common.h index 3d463aac..9f15a2d0 100644 --- a/code/renderercommon/tr_common.h +++ b/code/renderercommon/tr_common.h @@ -43,8 +43,7 @@ typedef enum IMGFLAG_NO_COMPRESSION = 0x0010, IMGFLAG_NOLIGHTSCALE = 0x0020, IMGFLAG_CLAMPTOEDGE = 0x0040, - IMGFLAG_SRGB = 0x0080, - IMGFLAG_GENNORMALMAP = 0x0100, + IMGFLAG_GENNORMALMAP = 0x0080, } imgFlags_t; typedef struct image_s { diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c index a774f7ec..d9c86279 100644 --- a/code/renderergl2/tr_shader.c +++ b/code/renderergl2/tr_shader.c @@ -2255,7 +2255,7 @@ static void CollapseStagesToLightall(shaderStage_t *diffuse, { char normalName[MAX_QPATH]; 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 COM_StripExtension(diffuseImg->imgName, normalName, MAX_QPATH); @@ -2301,7 +2301,7 @@ static void CollapseStagesToLightall(shaderStage_t *diffuse, { char specularName[MAX_QPATH]; 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); Q_strcat(specularName, MAX_QPATH, "_s");