X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_screen.c;h=0054851ed51ad55a3892b59db71ad9c6e5d29864;hb=5276075225f350c45e2a78a254cf1746e4c10948;hp=50ff6448a72b5e08007adba8a54b45075e28ff5a;hpb=e888f3e74c64c1d3bdbc603b4d95a7a513a750ea;p=xonotic%2Fdarkplaces.git

diff --git a/cl_screen.c b/cl_screen.c
index 50ff6448..0054851e 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -61,7 +61,6 @@ cvar_t shownetgraph = {CVAR_SAVE, "shownetgraph", "0", "shows a graph of packet
 cvar_t cl_demo_mousegrab = {0, "cl_demo_mousegrab", "0", "Allows reading the mouse input while playing demos. Useful for camera mods developed in csqc. (0: never, 1: always)"};
 cvar_t timedemo_screenshotframelist = {0, "timedemo_screenshotframelist", "", "when performing a timedemo, take screenshots of each frame in this space-separated list - example: 1 201 401"};
 
-extern cvar_t r_glsl;
 extern cvar_t v_glslgamma;
 extern cvar_t sbar_info_pos;
 #define WANT_SCREENSHOT_HWGAMMA (scr_screenshot_hwgamma.integer && vid_usinghwgamma)
@@ -1719,7 +1718,7 @@ static void SCR_SetLoadingScreenTexture(void)
 
 	SCR_ClearLoadingScreenTexture();
 
-	if (gl_support_arb_texture_non_power_of_two)
+	if (vid.support.arb_texture_non_power_of_two)
 	{
 		w = vid.width; h = vid.height;
 		loadingscreentexture_w = loadingscreentexture_h = 1;
@@ -2072,16 +2071,6 @@ void CL_UpdateScreen(void)
 	if (scr_fov.value > 170)
 		Cvar_Set ("fov","170");
 
-	// validate r_textureunits cvar
-	if (r_textureunits.integer > gl_textureunits)
-		Cvar_SetValueQuick(&r_textureunits, gl_textureunits);
-	if (r_textureunits.integer < 1)
-		Cvar_SetValueQuick(&r_textureunits, 1);
-
-	// validate gl_combine cvar
-	if (gl_combine.integer && !gl_combine_extension)
-		Cvar_SetValueQuick(&gl_combine, 0);
-
 	// intermission is always full screen
 	if (cl.intermission)
 		sb_lines = 0;