UNMERGE! Refactored R_UpdateEntityLighting to CL_UpdateEntityShading, which sets...

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 0ef93047a3f4247388044dae298cd8d14032ed4a..a2bbf496aa74956e20b83344ed963212cb8e026e 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;
 
@@ -2187,7 +2186,7 @@ static void SCR_DrawScreen (void)
                if (cl.csqc_loaded)
                        CL_VM_UpdateView(r_stereo_side ? 0.0 : max(0.0, cl.time - cl.oldtime));
                else
-                       R_RenderView(0, NULL, NULL, r_refdef.view.x, r_refdef.view.y, r_refdef.view.width, r_refdef.view.height);
+                       R_RenderView();
        }
 
        if (!r_stereo_sidebyside.integer && !r_stereo_horizontal.integer && !r_stereo_vertical.integer)
@@ -2272,8 +2271,6 @@ static void SCR_DrawScreen (void)
 
        DrawQ_Finish();
 
-       R_DrawGamma();
-
        R_Mesh_Finish();
 }
 
@@ -2598,6 +2595,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;