X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=shader_hlsl.h;h=57df52d06b330b06a2fbb0822a919000258298a8;hb=8b47c85e9f68469c822e942b5c22d4e5aa3b3700;hp=9b3f04c3faa71d9e5e0a4a3192c7d5e04904144c;hpb=cb77c846dbc2485d351d5d6db390b8d7a75cdae9;p=xonotic%2Fdarkplaces.git

diff --git a/shader_hlsl.h b/shader_hlsl.h
index 9b3f04c3..57df52d0 100644
--- a/shader_hlsl.h
+++ b/shader_hlsl.h
@@ -1329,12 +1329,6 @@
 "uniform sampler Texture_ReflectMask : register(s5),\n",
 "uniform samplerCUBE Texture_ReflectCube : register(s6),\n",
 "#endif\n",
-"#ifdef MODE_LIGHTDIRECTION\n",
-"uniform half3 LightColor : register(c21),\n",
-"#endif\n",
-"#ifdef MODE_LIGHTSOURCE\n",
-"uniform half3 LightColor : register(c21),\n",
-"#endif\n",
 "\n",
 "#if defined(MODE_LIGHTSOURCE) || defined(MODE_DEFERREDLIGHTSOURCE)\n",
 "uniform sampler Texture_Attenuation : register(s9),\n",
@@ -1451,7 +1445,6 @@
 "#else\n",
 "	color.rgb = diffusetex * Color_Ambient;\n",
 "#endif\n",
-"	color.rgb *= LightColor;\n",
 "	color.rgb *= half(tex2D(Texture_Attenuation, float2(length(CubeVector), 0.0)).r);\n",
 "#if defined(USESHADOWMAP2D)\n",
 "	color.rgb *= half(ShadowMapCompare(CubeVector, Texture_ShadowMap2D, ShadowMap_Parameters, ShadowMap_TextureScale\n",
@@ -1497,7 +1490,7 @@
 "	#ifdef USEDIFFUSE\n",
 "		half3 lightnormal = half3(normalize(LightVector));\n",
 "	#endif\n",
-"	#define lightcolor LightColor\n",
+"	#define lightcolor 1\n",
 "#endif // MODE_LIGHTDIRECTION\n",
 "#ifdef MODE_LIGHTDIRECTIONMAP_MODELSPACE\n",
 "	#define SHADING\n",
@@ -1536,7 +1529,7 @@
 "#ifdef MODE_FAKELIGHT\n",
 "	#define SHADING\n",
 "	half3 lightnormal = half3(normalize(EyeVector));\n",
-"	half3 lightcolor = half3(1.0,1.0,1.0);\n",
+"	#define lightcolor 1\n",
 "#endif // MODE_FAKELIGHT\n",
 "\n",
 "\n",