fixed repeated gamma ramp setting attempts in case of failure (again)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6404 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/vid_shared.c b/vid_shared.c
index 22ad1cb7ff4dd20a713400a83732421f8166fc9e..46325de89f8a51b322f34ccbe0f51cdd0cb06da9 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -717,7 +717,7 @@ void VID_UpdateGamma(qboolean force, int rampsize)
        if (!force
         && !forcenextframe
         && !v_psycho.integer
-        && vid_usinghwgamma == (vid_activewindow && v_hwgamma.integer)
+        && cachehwgamma == (vid_activewindow && v_hwgamma.integer)
         && v_gamma.value == cachegamma
         && v_contrast.value == cachecontrast
         && v_brightness.value == cachebrightness
@@ -733,9 +733,24 @@ void VID_UpdateGamma(qboolean force, int rampsize)
         && cachewhite[2] == v_color_white_b.value)
                return;
 
+       BOUNDCVAR(v_gamma, 0.1, 5);cachegamma = v_gamma.value;
+       BOUNDCVAR(v_contrast, 1, 5);cachecontrast = v_contrast.value;
+       BOUNDCVAR(v_brightness, 0, 0.8);cachebrightness = v_brightness.value;
+       BOUNDCVAR(v_color_black_r, 0, 0.8);cacheblack[0] = v_color_black_r.value;
+       BOUNDCVAR(v_color_black_g, 0, 0.8);cacheblack[1] = v_color_black_g.value;
+       BOUNDCVAR(v_color_black_b, 0, 0.8);cacheblack[2] = v_color_black_b.value;
+       BOUNDCVAR(v_color_grey_r, 0, 0.95);cachegrey[0] = v_color_grey_r.value;
+       BOUNDCVAR(v_color_grey_g, 0, 0.95);cachegrey[1] = v_color_grey_g.value;
+       BOUNDCVAR(v_color_grey_b, 0, 0.95);cachegrey[2] = v_color_grey_b.value;
+       BOUNDCVAR(v_color_white_r, 1, 5);cachewhite[0] = v_color_white_r.value;
+       BOUNDCVAR(v_color_white_g, 1, 5);cachewhite[1] = v_color_white_g.value;
+       BOUNDCVAR(v_color_white_b, 1, 5);cachewhite[2] = v_color_white_b.value;
+       cachecolorenable = v_color_enable.integer;
+       cachehwgamma = vid_activewindow && v_hwgamma.integer;
+
        forcenextframe = false;
 
-       if (vid_activewindow && v_hwgamma.integer)
+       if (cachehwgamma)
        {
                if (!vid_usinghwgamma)
                {
@@ -751,21 +766,6 @@ void VID_UpdateGamma(qboolean force, int rampsize)
                        VID_GetGamma(vid_systemgammaramps, vid_gammarampsize);
                }
 
-               BOUNDCVAR(v_gamma, 0.1, 5);cachegamma = v_gamma.value;
-               BOUNDCVAR(v_contrast, 1, 5);cachecontrast = v_contrast.value;
-               BOUNDCVAR(v_brightness, 0, 0.8);cachebrightness = v_brightness.value;
-               BOUNDCVAR(v_color_black_r, 0, 0.8);cacheblack[0] = v_color_black_r.value;
-               BOUNDCVAR(v_color_black_g, 0, 0.8);cacheblack[1] = v_color_black_g.value;
-               BOUNDCVAR(v_color_black_b, 0, 0.8);cacheblack[2] = v_color_black_b.value;
-               BOUNDCVAR(v_color_grey_r, 0, 0.95);cachegrey[0] = v_color_grey_r.value;
-               BOUNDCVAR(v_color_grey_g, 0, 0.95);cachegrey[1] = v_color_grey_g.value;
-               BOUNDCVAR(v_color_grey_b, 0, 0.95);cachegrey[2] = v_color_grey_b.value;
-               BOUNDCVAR(v_color_white_r, 1, 5);cachewhite[0] = v_color_white_r.value;
-               BOUNDCVAR(v_color_white_g, 1, 5);cachewhite[1] = v_color_white_g.value;
-               BOUNDCVAR(v_color_white_b, 1, 5);cachewhite[2] = v_color_white_b.value;
-               cachecolorenable = v_color_enable.integer;
-               cachehwgamma = v_hwgamma.integer;
-
                if (cachecolorenable)
                {
                        BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps, rampsize);