]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix some warnings in the shader
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 13 Mar 2011 17:19:24 +0000 (17:19 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 13 Mar 2011 17:19:24 +0000 (17:19 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10920 d7cf8633-e32d-0410-b094-e92efae38249

shader_glsl.h

index 7adabc437b64dfb9945851afb9b2403ff193a98b..ffd0f771d3e76addc679294146cb7ac6171e6cd7 100644 (file)
 "      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"
 "\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"