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 c017e252463b3507b3e02bb7d524ad876780b65b..aab246b6e1c93f3da54560dc4efb04254cc7014e 100644 (file)
--- 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;