From af0db9ea252f39372633225c6844350bc1f8a984 Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 25 Jul 2011 00:17:54 +0000 Subject: [PATCH] disable VorteX's gamma corrected 2D drawing because it is broken with vid_sRGB 1, the patch needs more work before it will be used git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11253 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index 7656e011..b5faeb34 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -1910,8 +1910,9 @@ void R_SetupShader_Generic(rtexture_t *first, rtexture_t *second, int texturemod permutation |= SHADERPERMUTATION_SPECULAR; if (texturemode == GL_MODULATE) permutation |= SHADERPERMUTATION_COLORMAPPING; - if (usegamma && r_texture_gammaramps && v_glslgamma.integer && !vid_gammatables_trivial) - permutation |= SHADERPERMUTATION_GAMMARAMPS; +// LordHavoc: VorteX broke the game by doing this, and did not cvar it properly, and did not add the proper checks (r_texture_sRGB_2d.integer would need to be checked), and it breaks with vid_sRGB where the gamma ramps are altered... +// if (usegamma && r_texture_gammaramps && v_glslgamma.integer && !vid_gammatables_trivial) +// permutation |= SHADERPERMUTATION_GAMMARAMPS; else if (texturemode == GL_ADD) permutation |= SHADERPERMUTATION_GLOW; else if (texturemode == GL_DECAL) -- 2.39.2