From c4d047c684c70272d81989ed45f27c3ba6fac312 Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 13 Mar 2011 17:19:24 +0000 Subject: [PATCH] fix some warnings in the shader git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10920 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=f4ff4dd39c413021093d870116f788261244ce60 --- shader_glsl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shader_glsl.h b/shader_glsl.h index 7adabc43..ffd0f771 100644 --- a/shader_glsl.h +++ b/shader_glsl.h @@ -1000,9 +1000,9 @@ " VectorT = vec4(Attrib_TexCoord2.xyz, EyePosition.y - Attrib_Position.y);\n" " VectorR = vec4(Attrib_TexCoord3.xyz, EyePosition.z - Attrib_Position.z);\n" "# else\n" -" VectorS = Attrib_TexCoord1;\n" -" VectorT = Attrib_TexCoord2;\n" -" VectorR = Attrib_TexCoord3;\n" +" VectorS = vec4(Attrib_TexCoord1, 0);\n" +" VectorT = vec4(Attrib_TexCoord2, 0);\n" +" VectorR = vec4(Attrib_TexCoord3, 0);\n" "# endif\n" "#else\n" "# ifdef USEFOG\n" @@ -1111,7 +1111,7 @@ "\n" "#ifdef USEREFLECTCUBE\n" " vec3 TangentReflectVector = reflect(-EyeVectorFogDepth.xyz, surfacenormal);\n" -" vec3 ModelReflectVector = TangentReflectVector.x * VectorS + TangentReflectVector.y * VectorT + TangentReflectVector.z * VectorR;\n" +" vec3 ModelReflectVector = TangentReflectVector.x * VectorS.xyz + TangentReflectVector.y * VectorT.xyz + TangentReflectVector.z * VectorR.xyz;\n" " vec3 ReflectCubeTexCoord = vec3(ModelToReflectCube * vec4(ModelReflectVector, 0));\n" " diffusetex += myhalf3(offsetMappedTexture2D(Texture_ReflectMask)) * myhalf3(textureCube(Texture_ReflectCube, ReflectCubeTexCoord));\n" "#endif\n" -- 2.39.2