Some DX fixes

hrydgard · Oct 17, 2020 · d7b5040 · d7b5040
1 parent d7d376b
commit d7b5040
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/GPU/Common/VertexShaderGeneratorCommon.cpp b/GPU/Common/VertexShaderGeneratorCommon.cpp
@@ -44,7 +44,7 @@ char *WriteLights(char *p, const VShaderID &id, DoLightComputation doLight[4], b
 		}
 
 		if (!*specularIsZero) {
-			WRITE(p, "  vec3 lightSum1 = vec3(0.0);\n");
+			WRITE(p, "  vec3 lightSum1 = splat3(0.0);\n");
 		}
 		if (!diffuseIsZero) {
 			WRITE(p, "  vec3 toLight;\n");

diff --git a/GPU/Directx9/VertexShaderGeneratorDX9.cpp b/GPU/Directx9/VertexShaderGeneratorDX9.cpp
@@ -108,6 +108,7 @@ void GenerateVertexShaderHLSL(const VShaderID &id, char *buffer, ShaderLanguage
 	WRITE(p, "#define vec2 float2\n");
 	WRITE(p, "#define mediump\n");
 	WRITE(p, "#define lowp\n");
+	WRITE(p, "#define splat3(x) float3(x, x, x)\n");
 
 	if (lang == HLSL_DX9) {
 		WRITE(p, "#pragma warning( disable : 3571 )\n");
@@ -365,7 +366,7 @@ void GenerateVertexShaderHLSL(const VShaderID &id, char *buffer, ShaderLanguage
 	if (hasColor) {
 		WRITE(p, "  float4 color0 = In.color0;\n");
 	}
-	if (lmode)
+	if (lmode && !useHWTransform)
 		WRITE(p, "  float4 color1 = In.color1;\n");
 	if (doTexture && hasTexcoord) {
 		if (texCoordInVec3) {