From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 5 Jan 2010 18:21:35 +0000 (+0000)
Subject: fix some shader compile errors related to MODE_LIGHTDIRECTION
X-Git-Tag: xonotic-v0.1.0preview~230^2~681
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4aace403959c72b0449368212b29a7d7dd550355;p=xonotic%2Fdarkplaces.git

fix some shader compile errors related to MODE_LIGHTDIRECTION


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 126f024c..e56b7b3c 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -843,7 +843,7 @@ static const char *builtinshaderstring =
 "#ifdef MODE_LIGHTSOURCE\n"
 "varying vec3 LightVector;\n"
 "#endif\n"
-"#if defined(MODE_LIGHTDIRECTION)\n"
+"#if defined(MODE_LIGHTDIRECTION) && defined(USEDIFFUSE)\n"
 "varying vec3 LightVector;\n"
 "#endif\n"
 "\n"
@@ -1361,8 +1361,8 @@ static const char *builtinshaderstring =
 "\n"
 "# ifdef USECUBEFILTER\n"
 "	vec3 cubecolor = textureCube(Texture_Cube, CubeVector).rgb;\n"
-"	gl_FragData[0] *= cubecolor;\n"
-"	gl_FragData[1] *= cubecolor;\n"
+"	gl_FragData[0].rgb *= cubecolor;\n"
+"	gl_FragData[1].rgb *= cubecolor;\n"
 "# endif\n"
 "}\n"
 "#endif // FRAGMENT_SHADER\n"
@@ -1547,7 +1547,9 @@ static const char *builtinshaderstring =
 "\n"
 "#ifdef MODE_LIGHTDIRECTION\n"
 "#define SHADING\n"
+"#ifdef USEDIFFUSE\n"
 "	myhalf3 lightnormal = myhalf3(normalize(LightVector));\n"
+"#endif\n"
 "#define lightcolor LightColor\n"
 "#endif // MODE_LIGHTDIRECTION\n"
 "#ifdef MODE_LIGHTDIRECTIONMAP_MODELSPACE\n"
@@ -2977,7 +2979,9 @@ const char *builtincgshaderstring =
 "\n"
 "#ifdef MODE_LIGHTDIRECTION\n"
 "#define SHADING\n"
+"#ifdef USEDIFFUSE
 "	half3 lightnormal = half3(normalize(LightVector));\n"
+"#endif\n"
 "#define lightcolor LightColor\n"
 "#endif // MODE_LIGHTDIRECTION\n"
 "#ifdef MODE_LIGHTDIRECTIONMAP_MODELSPACE\n"