v_glslgamma: make GLSL postprocessing take over the job of v_hwgamma completely,...

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index c9e03c201354560ed755fc46342d690dec760a0a..fdd0d7c37bac6784b53405e04744ba8e3cb3d5a4 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -31,6 +31,8 @@ cvar_t r_textshadow = {CVAR_SAVE, "r_textshadow", "0", "draws a shadow on all te
 cvar_t r_textbrightness = {CVAR_SAVE, "r_textbrightness", "0", "additional brightness for text color codes (0 keeps colors as is, 1 makes them all white)"};
 cvar_t r_textcontrast = {CVAR_SAVE, "r_textcontrast", "1", "additional contrast for text color codes (1 keeps colors as is, 1 makes them all black)"};
 
+extern cvar_t v_glslgamma;
+
 //=============================================================================
 /* Support Routines */
 
@@ -1217,7 +1219,7 @@ static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 1000
 void R_DrawGamma(void)
 {
        float c[4];
-       if (!vid_usinghwgamma)
+       if (!vid_usinghwgamma && !(r_glsl.integer && v_glslgamma.integer))
        {
                // all the blends ignore depth
                R_Mesh_VertexPointer(blendvertex3f, 0, 0);