From a60992ad5c588e3116dcdcd94fab3ff3f47b0ba7 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 9 Mar 2010 01:59:20 +0000 Subject: [PATCH] change texcoord assignments in Cg shader back to the way it was, because there was a conflict on TEXCOORD5 in one situation git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10046 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index 88e7a810..39b2d3a3 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -2786,10 +2786,10 @@ const char *builtincgshaderstring = "out float4 EyeVectorModelSpaceFogPlaneVertexDist : TEXCOORD4,\n" "#endif\n" "#if defined(MODE_LIGHTSOURCE) || defined(MODE_LIGHTDIRECTION)\n" -"out float3 LightVector : TEXCOORD5,\n" +"out float3 LightVector : TEXCOORD1,\n" "#endif\n" "#ifdef MODE_LIGHTSOURCE\n" -"out float3 CubeVector : TEXCOORD6,\n" +"out float3 CubeVector : TEXCOORD3,\n" "#endif\n" "#if defined(MODE_LIGHTDIRECTIONMAP_MODELSPACE) || defined(MODE_DEFERREDGEOMETRY) || defined(USEREFLECTCUBE)\n" "out float3 VectorS : TEXCOORD5, // direction of S texcoord (sometimes crudely called tangent)\n" @@ -2892,10 +2892,10 @@ const char *builtincgshaderstring = "float4 EyeVectorModelSpaceFogPlaneVertexDist : TEXCOORD4,\n" "#endif\n" "#if defined(MODE_LIGHTSOURCE) || defined(MODE_LIGHTDIRECTION)\n" -"float3 LightVector : TEXCOORD5,\n" +"float3 LightVector : TEXCOORD1,\n" "#endif\n" "#ifdef MODE_LIGHTSOURCE\n" -"float3 CubeVector : TEXCOORD6,\n" +"float3 CubeVector : TEXCOORD3,\n" "#endif\n" "#ifdef MODE_DEFERREDLIGHTSOURCE\n" "float4 ModelViewPosition : TEXCOORD0,\n" -- 2.39.2