simplified d3d shaders now that we always have prelight declared

aap · Apr 25, 2020 · 5ffbde3 · 5ffbde3
1 parent 1371a42
commit 5ffbde3
Show file tree

Hide file tree

Showing 22 changed files with 798 additions and 931 deletions.
diff --git a/src/d3d/shaders/default_PS.h b/src/d3d/shaders/default_PS.h
@@ -2,7 +2,7 @@
 //
 // Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
 //
-//   fxc /T ps_2_0 /Fh default_PS.h default_PS.hlsl
+//   fxc /nologo /T ps_2_0 /Fh default_PS.h default_PS.hlsl
 //
 //
 // Parameters:

diff --git a/src/d3d/shaders/default_VS.hlsl b/src/d3d/shaders/default_VS.hlsl
@@ -25,10 +25,7 @@ VS_out main(in VS_in input)
 
 	output.TexCoord0.xy = input.TexCoord;
 
-	output.Color = float4(0.0, 0.0, 0.0, 1.0);
-	if(surfPrelight > 0.0)
-		output.Color = input.Prelight;
-
+	output.Color = input.Prelight;
 	output.Color.rgb += ambientLight.rgb * surfAmbient;
 
 	int i;