From 1ae66cd9510af5fc9f388c6eb180d77e3a9a2e19 Mon Sep 17 00:00:00 2001 From: divverent Date: Mon, 28 May 2007 23:40:25 +0000 Subject: [PATCH] ignore r_glsl_contrastboost in range 0..1 (it breaks overbright pixels in that range), that is, the cvar now only does anything when > 1 (brighten up image) or < 0 (threshold effect) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7381 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index bb390522..4501dba1 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -855,7 +855,7 @@ int R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, fl if (r_glsl_offsetmapping_reliefmapping.integer) permutation |= SHADERPERMUTATION_OFFSETMAPPING_RELIEFMAPPING; } - if(r_glsl_contrastboost.value != 1 && r_glsl_contrastboost.value != 0) + if(r_glsl_contrastboost.value > 1 || r_glsl_contrastboost.value < 0) permutation |= SHADERPERMUTATION_CONTRASTBOOST; } else if (rsurface.texture->currentmaterialflags & MATERIALFLAG_FULLBRIGHT) @@ -875,7 +875,7 @@ int R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, fl if (r_glsl_offsetmapping_reliefmapping.integer) permutation |= SHADERPERMUTATION_OFFSETMAPPING_RELIEFMAPPING; } - if(r_glsl_contrastboost.value != 1 && r_glsl_contrastboost.value != 0) + if(r_glsl_contrastboost.value > 1 || r_glsl_contrastboost.value < 0) permutation |= SHADERPERMUTATION_CONTRASTBOOST; } else if (modellighting) @@ -898,7 +898,7 @@ int R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, fl if (r_glsl_offsetmapping_reliefmapping.integer) permutation |= SHADERPERMUTATION_OFFSETMAPPING_RELIEFMAPPING; } - if(r_glsl_contrastboost.value != 1 && r_glsl_contrastboost.value != 0) + if(r_glsl_contrastboost.value > 1 || r_glsl_contrastboost.value < 0) permutation |= SHADERPERMUTATION_CONTRASTBOOST; } else @@ -940,7 +940,7 @@ int R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, fl if (r_glsl_offsetmapping_reliefmapping.integer) permutation |= SHADERPERMUTATION_OFFSETMAPPING_RELIEFMAPPING; } - if(r_glsl_contrastboost.value != 1 && r_glsl_contrastboost.value != 0) + if(r_glsl_contrastboost.value > 1 || r_glsl_contrastboost.value < 0) permutation |= SHADERPERMUTATION_CONTRASTBOOST; } if (!r_glsl_permutations[permutation & SHADERPERMUTATION_MASK].program) -- 2.39.2