From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 6 Dec 2007 15:55:58 +0000 (+0000)
Subject: fix two mistakes in glsl/default.glsl deluxemapping paths which broke on
X-Git-Tag: xonotic-v0.1.0preview~2719
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1bf079f450814d2ff5764fab145fc70f3cd3ebae;p=xonotic%2Fdarkplaces.git

fix two mistakes in glsl/default.glsl deluxemapping paths which broke on
ATI


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 35c63ab1..fa7f2acd 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -793,7 +793,8 @@ static const char *builtinshaderstring =
 "# endif\n"
 "\n"
 "	// apply lightmap color\n"
-"	color.rgb = myhvec4(tempcolor,1) * myhvec4(texture2D(Texture_Lightmap, TexCoordLightmap)) * myhvec4(gl_Color) + myhvec4(color.rgb * AmbientScale, 0);\n"
+"	color.rgb = tempcolor * myhvec3(texture2D(Texture_Lightmap, TexCoordLightmap)) * myhvec3(gl_Color) + color * AmbientScale;\n"
+"	color.a *= myhalf(gl_Color.a);\n"
 "#endif // MODE_LIGHTDIRECTIONMAP_MODELSPACE\n"
 "\n"
 "\n"
@@ -814,7 +815,8 @@ static const char *builtinshaderstring =
 "# endif\n"
 "\n"
 "	// apply lightmap color\n"
-"	color = myhvec4(tempcolor, 1) * myhvec4(texture2D(Texture_Lightmap, TexCoordLightmap)) * myhvec4(gl_Color) + myhvec4(color.rgb * AmbientScale, 0);\n"
+"	color.rgb = tempcolor * myhvec3(texture2D(Texture_Lightmap, TexCoordLightmap)) * myhvec3(gl_Color) + color * AmbientScale;\n"
+"	color.a *= myhalf(gl_Color.a);\n"
 "#endif // MODE_LIGHTDIRECTIONMAP_TANGENTSPACE\n"
 "\n"
 "\n"