From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 28 Jun 2005 23:10:21 +0000 (+0000)
Subject: default offsetmapping off (as it messes up model skins)
X-Git-Tag: xonotic-v0.1.0preview~4714
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95e0893e5dec7501a4ff07d7522dd4ce24b645aa;p=xonotic%2Fdarkplaces.git

default offsetmapping off (as it messes up model skins)
fixed permutation failure prints (now lists all 6 flags not just 4)


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

diff --git a/r_shadow.c b/r_shadow.c
index bee2bf6e..81f23d48 100644
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -220,7 +220,7 @@ cvar_t r_shadow_texture3d = {0, "r_shadow_texture3d", "1"};
 cvar_t r_shadow_visiblelighting = {0, "r_shadow_visiblelighting", "0"};
 cvar_t r_shadow_visiblevolumes = {0, "r_shadow_visiblevolumes", "0"};
 cvar_t r_shadow_glsl = {0, "r_shadow_glsl", "1"};
-cvar_t r_shadow_glsl_offsetmapping = {0, "r_shadow_glsl_offsetmapping", "1"};
+cvar_t r_shadow_glsl_offsetmapping = {0, "r_shadow_glsl_offsetmapping", "0"};
 cvar_t r_shadow_glsl_offsetmapping_scale = {0, "r_shadow_glsl_offsetmapping_scale", "-0.04"};
 cvar_t r_shadow_glsl_offsetmapping_bias = {0, "r_shadow_glsl_offsetmapping_bias", "0.04"};
 cvar_t r_shadow_glsl_geforcefxlowquality = {0, "r_shadow_glsl_geforcefxlowquality", "1"};
@@ -505,7 +505,7 @@ void r_shadow_start(void)
 			r_shadow_program_light[i] = GL_Backend_CompileProgram(vertstrings_count, vertstrings_list, fragstrings_count, fragstrings_list);
 			if (!r_shadow_program_light[i])
 			{
-				Con_Printf("permutation %s %s %s %s failed for shader %s, some features may not work properly!\n", i & 1 ? "specular" : "", i & 2 ? "fog" : "", i & 4 ? "cubefilter" : "", i & 8 ? "offsetmapping" : "", "glsl/light");
+				Con_Printf("permutation %s %s %s %s %s %s failed for shader %s, some features may not work properly!\n", i & 1 ? "specular" : "", i & 2 ? "fog" : "", i & 4 ? "cubefilter" : "", i & 8 ? "offsetmapping" : "", i & 16 ? "surfacenormalize" : "", i & 32 ? "geforcefx" : "", "glsl/light");
 				continue;
 			}
 			qglUseProgramObjectARB(r_shadow_program_light[i]);