Remove v_glslgamma cvar (now assumed to be 1) and corresponding code like R_DrawGamma.

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 771d27c927ece82b57722d31cfbaa212454ca4ae..abde7491d46ee60e730a7c891418a01be47be255 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -112,7 +112,6 @@ cvar_t r_speeds_graph_maxdefault = {CVAR_SAVE, "r_speeds_graph_maxdefault", "100
 
 
 
-extern cvar_t v_glslgamma;
 extern cvar_t sbar_info_pos;
 extern cvar_t r_fog_clear;
 
@@ -1895,6 +1894,7 @@ static void R_Envmap_f (void)
        buffer1 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 4);
        buffer2 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3);
 
+       CL_UpdateEntityShading();
        for (j = 0;j < 12;j++)
        {
                dpsnprintf(filename, sizeof(filename), "env/%s%s.tga", basename, envmapinfo[j].name);
@@ -2182,8 +2182,15 @@ static void SCR_DrawScreen (void)
                r_refdef.view.ortho_x = atan(r_refdef.view.frustum_x) * (360.0 / M_PI); // abused as angle by VM_CL_R_SetView
                r_refdef.view.ortho_y = atan(r_refdef.view.frustum_y) * (360.0 / M_PI); // abused as angle by VM_CL_R_SetView
 
-               if(!CL_VM_UpdateView(r_stereo_side ? 0.0 : max(0.0, cl.time - cl.oldtime)))
+               // if CSQC is loaded, it is required to provide the CSQC_UpdateView function,
+               // and won't render a view if it does not call that.
+               if (cl.csqc_loaded)
+                       CL_VM_UpdateView(r_stereo_side ? 0.0 : max(0.0, cl.time - cl.oldtime));
+               else
+               {
+                       CL_UpdateEntityShading();
                        R_RenderView();
+               }
        }
 
        if (!r_stereo_sidebyside.integer && !r_stereo_horizontal.integer && !r_stereo_vertical.integer)
@@ -2268,8 +2275,6 @@ static void SCR_DrawScreen (void)
 
        DrawQ_Finish();
 
-       R_DrawGamma();
-
        R_Mesh_Finish();
 }
 
@@ -2594,6 +2599,10 @@ void SCR_UpdateLoadingScreen (qboolean clear, qboolean startup)
                loadingscreen_lastupdate = t;
        }
 
+       // set up the r_texture_gammaramps texture which we need for rendering the loadingscreenpic
+       VID_UpdateGamma();
+       R_UpdateVariables();
+
        if(!scr_loadingscreen_background.integer)
                clear = true;