added USEREFLECTCUBE case to MODE_GENERIC, this disables use of texture

[xonotic/darkplaces.git] / shader_hlsl.h

diff --git a/shader_hlsl.h b/shader_hlsl.h
index 4b6da04ed694702a5f0433cb26c2d8f03e4f920b..a1d537d4bc3faeb358e40961eedcca577fe50eba 100644 (file)
--- a/shader_hlsl.h
+++ b/shader_hlsl.h
@@ -307,7 +307,12 @@
 "      gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);\n"
 "#endif\n"
 "#ifdef USEDIFFUSE\n"
+"# ifdef USEREFLECTCUBE\n"
+"      // suppress texture alpha\n"
+"      dp_FragColor.rgb *= tex2D(Texture_First, TexCoord1).rgb;\n"
+"# else\n"
 "      gl_FragColor *= tex2D(Texture_First, TexCoord1);\n"
+"# endif\n"
 "#endif\n"
 "\n"
 "#ifdef USESPECULAR\n"
@@ -323,9 +328,9 @@
 "# endif\n"
 "#endif\n"
 "#ifdef USEGAMMARAMPS\n"
-"      dp_FragColor.r = dp_texture2D(Texture_GammaRamps, vec2(dp_FragColor.r, 0)).r;\n"
-"      dp_FragColor.g = dp_texture2D(Texture_GammaRamps, vec2(dp_FragColor.g, 0)).g;\n"
-"      dp_FragColor.b = dp_texture2D(Texture_GammaRamps, vec2(dp_FragColor.b, 0)).b;\n"
+"      dp_FragColor.r = tex2D(Texture_GammaRamps, vec2(dp_FragColor.r, 0)).r;\n"
+"      dp_FragColor.g = tex2D(Texture_GammaRamps, vec2(dp_FragColor.g, 0)).g;\n"
+"      dp_FragColor.b = tex2D(Texture_GammaRamps, vec2(dp_FragColor.b, 0)).b;\n"
 "#endif\n"
 "}\n"
 "#endif\n"