disable VorteX's gamma corrected 2D drawing because it is broken with

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 7656e011c6d79cbf208fb4b0d4e5c72c6476d190..b5faeb344e6cddfbffba8d1e0d484d05af13c6fa 100644 (file)
--- 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)