From 1190e59ac9da31cd10085b172858b91112cb5695 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 19 Feb 2010 14:45:49 +0000 Subject: [PATCH] fix two compile errors in cg shader git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9987 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 be299bf2..29b9585d 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -2789,7 +2789,7 @@ const char *builtincgshaderstring = "float3 VectorR : TEXCOORD7, // direction of R texcoord (surface normal)\n" "#endif\n" "#ifdef USESHADOWMAPORTHO\n" -"float3 ShadowMapTC : TEXCOORD8\n" +"float3 ShadowMapTC : TEXCOORD8,\n" "#endif\n" "\n" "uniform sampler2D Texture_Normal,\n" @@ -2973,9 +2973,9 @@ const char *builtincgshaderstring = "#endif\n" "\n" "#ifdef USEREFLECTCUBE\n" -" vec3 TangentReflectVector = reflect(-EyeVector, surfacenormal);\n" -" vec3 ModelReflectVector = TangentReflectVector.x * VectorS + TangentReflectVector.y * VectorT + TangentReflectVector.z * VectorR;\n" -" vec3 ReflectCubeTexCoord = float3(mul(ModelToReflectCube, float4(ModelReflectVector, 0)));\n" +" float3 TangentReflectVector = reflect(-EyeVector, surfacenormal);\n" +" float3 ModelReflectVector = TangentReflectVector.x * VectorS + TangentReflectVector.y * VectorT + TangentReflectVector.z * VectorR;\n" +" float3 ReflectCubeTexCoord = float3(mul(ModelToReflectCube, float4(ModelReflectVector, 0)));\n" " diffusetex += half3(tex2D(Texture_ReflectMask, TexCoord)) * half3(texCUBE(Texture_ReflectCube, ReflectCubeTexCoord));\n" "#endif\n" "\n" -- 2.39.2