From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 7 Dec 2009 15:35:03 +0000 (+0000)
Subject: load fog textures in all cases again
X-Git-Tag: xonotic-v0.1.0preview~1095
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=b0c8aa8bfd177005818314b5cbee3f124008ebdd

load fog textures in all cases again
load gloss/normalmap based on hardware capabilities, rather than r_glsl
and gl_combine cvars


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

diff --git a/gl_rmain.c b/gl_rmain.c
index c017e252..aab246b6 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2951,9 +2951,8 @@ void R_Main_ResizeViewCache(void)
 
 void gl_main_start(void)
 {
-	r_loadnormalmap = r_glsl.integer || gl_combine.integer;
-	r_loadgloss = r_glsl.integer || gl_combine.integer;
-	r_loadfog = !r_glsl.integer;
+	r_loadnormalmap = r_loadgloss = gl_dot3arb || gl_support_fragment_shader;
+	r_loadfog = true;
 
 	r_numqueries = 0;
 	r_maxqueries = 0;