fix: Stop z-fighting by pushing world/view/projection multiplications onto the GPU

twpol · twpol · commit 791c0a3ad6d0 · 2023-03-02T22:51:55.000Z
diff --git a/Source/RunActivity/Content/SceneryShader.fx b/Source/RunActivity/Content/SceneryShader.fx
@@ -24,7 +24,8 @@
 ////////////////////    G L O B A L   V A L U E S    ///////////////////////////
 
 float4x4 World;         // model -> world
-float4x4 WorldViewProjection;  // model -> world -> view -> projection
+float4x4 View;          // world -> view
+float4x4 Projection;    // view -> projection
 float4x4 LightViewProjectionShadowProjection0;  // world -> light view -> light projection -> shadow map projection
 float4x4 LightViewProjectionShadowProjection1;
 float4x4 LightViewProjectionShadowProjection2;
@@ -156,7 +157,7 @@ struct VERTEX_OUTPUT
 void _VSNormalProjection(in VERTEX_INPUT In, inout VERTEX_OUTPUT Out)
 {
 	// Project position, normal and copy texture coords
-	Out.Position = mul(In.Position, WorldViewProjection);
+	Out.Position = mul(mul(mul(In.Position, World), View), Projection);
 	Out.RelPosition.xyz = mul(In.Position, World).xyz - ViewerPos;
 	Out.RelPosition.w = Out.Position.z;
 	Out.TexCoords.xy = In.TexCoords;
@@ -184,7 +185,7 @@ void _VSSignalProjection(uniform bool Glow, in VERTEX_INPUT_SIGNAL In, inout VER
 		const float GlowScalingFactor = 40;
 		In.Position.xyz *= log(1 + max(0, length(relPos) - GlowCutOffM) / GlowScalingFactor) * ZBias_Lighting.x;
 	}
-	Out.Position = mul(In.Position, WorldViewProjection);
+	Out.Position = mul(mul(mul(In.Position, World), View), Projection);
 	Out.RelPosition.xyz = relPos;
 	Out.RelPosition.w = Out.Position.z;
 	Out.TexCoords.xy = In.TexCoords;
@@ -194,7 +195,7 @@ void _VSSignalProjection(uniform bool Glow, in VERTEX_INPUT_SIGNAL In, inout VER
 void _VSTransferProjection(in VERTEX_INPUT_TRANSFER In, inout VERTEX_OUTPUT Out)
 {
 	// Project position, normal and copy texture coords
-	Out.Position = mul(In.Position, WorldViewProjection);
+	Out.Position = mul(mul(mul(In.Position, World), View), Projection);
 	Out.RelPosition.xyz = mul(In.Position, World).xyz - ViewerPos;
 	Out.RelPosition.w = Out.Position.z;
 	Out.TexCoords.xy = In.TexCoords;
@@ -301,7 +302,7 @@ VERTEX_OUTPUT VSForest(in VERTEX_INPUT_FOREST In)
 	In.Position = float4(newPosition, 1);
 
 	// Project vertex with fixed w=1 and normal=eye.
-	Out.Position = mul(In.Position, WorldViewProjection);
+	Out.Position = mul(mul(mul(In.Position, World), View), Projection);
 	Out.RelPosition.xyz = mul(In.Position, World).xyz - ViewerPos;
 	Out.RelPosition.w = Out.Position.z;
 	Out.TexCoords.xy = In.TexCoords;
diff --git a/Source/RunActivity/Viewer3D/Forest.cs b/Source/RunActivity/Viewer3D/Forest.cs
@@ -431,15 +431,14 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
         public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
         {
             var shader = Viewer.MaterialManager.SceneryShader;
-            var viewproj = XNAViewMatrix * XNAProjectionMatrix;
 
             shader.SetViewMatrix(ref XNAViewMatrix);
             ShaderPasses.Reset();
             while (ShaderPasses.MoveNext())
             {
                 foreach (var item in renderItems)
                 {
-                    shader.SetMatrix(item.XNAMatrix, ref viewproj);
+                    shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
 
diff --git a/Source/RunActivity/Viewer3D/Materials.cs b/Source/RunActivity/Viewer3D/Materials.cs
@@ -904,14 +904,13 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
         public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
         {
             var shader = Viewer.MaterialManager.SceneryShader;
-            var viewProj = XNAViewMatrix * XNAProjectionMatrix;
 
             ShaderPasses.Reset();
             while (ShaderPasses.MoveNext())
             {
                 foreach (var item in renderItems)
                 {
-                    shader.SetMatrix(item.XNAMatrix, ref viewProj);
+                    shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
 
diff --git a/Source/RunActivity/Viewer3D/Shaders.cs b/Source/RunActivity/Viewer3D/Shaders.cs
@@ -78,7 +78,8 @@ class Logger : ContentBuildLogger
     public class SceneryShader : Shader
     {
         readonly EffectParameter world;
-        readonly EffectParameter worldViewProjection;
+        readonly EffectParameter view;
+        readonly EffectParameter projection;
         readonly EffectParameter[] lightViewProjectionShadowProjection;
         readonly EffectParameter[] shadowMapTextures;
         readonly EffectParameter shadowMapLimit;
@@ -116,10 +117,11 @@ public void SetViewMatrix(ref Matrix v)
             sideVector.SetValue(Vector3.Normalize(Vector3.Cross(_eyeVector, Vector3.Down)));
         }
 
-        public void SetMatrix(Matrix w, ref Matrix vp)
+        public void SetMatrix(Matrix w, ref Matrix v, ref Matrix p)
         {
             world.SetValue(w);
-            worldViewProjection.SetValue(w * vp);
+            view.SetValue(v);
+            projection.SetValue(p);
 
             int vIn = Program.Simulator.Settings.DayAmbientLight;
             
@@ -225,7 +227,8 @@ public SceneryShader(GraphicsDevice graphicsDevice)
             : base(graphicsDevice, "SceneryShader")
         {
             world = Parameters["World"];
-            worldViewProjection = Parameters["WorldViewProjection"];
+            view = Parameters["View"];
+            projection = Parameters["Projection"];
             lightViewProjectionShadowProjection = new EffectParameter[RenderProcess.ShadowMapCountMaximum];
             shadowMapTextures = new EffectParameter[RenderProcess.ShadowMapCountMaximum];
             for (var i = 0; i < RenderProcess.ShadowMapCountMaximum; i++)
diff --git a/Source/RunActivity/Viewer3D/Signals.cs b/Source/RunActivity/Viewer3D/Signals.cs
@@ -694,14 +694,12 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
 
         public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
         {
-            var viewProj = XNAViewMatrix * XNAProjectionMatrix;
-
             foreach (var pass in SceneryShader.CurrentTechnique.Passes)
             {
                 foreach (var item in renderItems)
                 {
                     SceneryShader.SignalLightIntensity = (item.ItemData as SignalLightState).GetIntensity();
-                    SceneryShader.SetMatrix(item.XNAMatrix, ref viewProj);
+                    SceneryShader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);
                     pass.Apply();
                     item.RenderPrimitive.Draw(graphicsDevice);
                 }
@@ -752,16 +750,14 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
 
         public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
         {
-            var viewProj = XNAViewMatrix * XNAProjectionMatrix;
-
             foreach (var pass in SceneryShader.CurrentTechnique.Passes)
             {
                 foreach (var item in renderItems)
                 {
                     var slp = item.RenderPrimitive as SignalLightPrimitive;
                     SceneryShader.ZBias = MathHelper.Lerp(slp.GlowIntensityDay, slp.GlowIntensityNight, NightEffect);
                     SceneryShader.SignalLightIntensity = (item.ItemData as SignalLightState).GetIntensity();
-                    SceneryShader.SetMatrix(item.XNAMatrix, ref viewProj);
+                    SceneryShader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);
                     pass.Apply();
                     item.RenderPrimitive.Draw(graphicsDevice);
                 }
diff --git a/Source/RunActivity/Viewer3D/Terrain.cs b/Source/RunActivity/Viewer3D/Terrain.cs
@@ -530,14 +530,13 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
         public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
         {
             var shader = Viewer.MaterialManager.SceneryShader;
-            var viewproj = XNAViewMatrix * XNAProjectionMatrix;
 
             ShaderPasses.Reset();
             while (ShaderPasses.MoveNext())
             {
                 foreach (var item in renderItems)
                 {
-                    shader.SetMatrix(item.XNAMatrix, ref viewproj);
+                    shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
                     // SamplerStates can only be set after the ShaderPasses.Current.Apply().
diff --git a/Source/RunActivity/Viewer3D/Transfers.cs b/Source/RunActivity/Viewer3D/Transfers.cs
@@ -178,15 +178,14 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
         public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
         {
             var shader = Viewer.MaterialManager.SceneryShader;
-            var viewproj = XNAViewMatrix * XNAProjectionMatrix;
 
             shader.SetViewMatrix(ref XNAViewMatrix);
             ShaderPasses.Reset();
             while (ShaderPasses.MoveNext())
             {
                 foreach (var item in renderItems)
                 {
-                    shader.SetMatrix(item.XNAMatrix, ref viewproj);
+                    shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
                     // SamplerStates can only be set after the ShaderPasses.Current.Apply().
diff --git a/Source/RunActivity/Viewer3D/Water.cs b/Source/RunActivity/Viewer3D/Water.cs
@@ -185,14 +185,13 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
         public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
         {
             var shader = Viewer.MaterialManager.SceneryShader;
-            var viewproj = XNAViewMatrix * XNAProjectionMatrix;
 
             ShaderPasses.Reset();
             while (ShaderPasses.MoveNext())
             {
                 foreach (var item in renderItems)
                 {
-                    shader.SetMatrix(item.XNAMatrix, ref viewproj);
+                    shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
                     // SamplerStates can only be set after the ShaderPasses.Current.Apply().

Original file line number	Diff line number	Diff line change
`@@ -431,15 +431,14 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`431`	`431`	`public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)`
`432`	`432`	`{`
`433`	`433`	`var shader = Viewer.MaterialManager.SceneryShader;`
`434`		`- var viewproj = XNAViewMatrix * XNAProjectionMatrix;`
`435`	`434`
`436`	`435`	`shader.SetViewMatrix(ref XNAViewMatrix);`
`437`	`436`	`ShaderPasses.Reset();`
`438`	`437`	`while (ShaderPasses.MoveNext())`
`439`	`438`	`{`
`440`	`439`	`foreach (var item in renderItems)`
`441`	`440`	`{`
`442`		`- shader.SetMatrix(item.XNAMatrix, ref viewproj);`
	`441`	`+ shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);`
`443`	`442`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`444`	`443`	`ShaderPasses.Current.Apply();`
`445`	`444`
Original file line number	Diff line number	Diff line change
`@@ -904,14 +904,13 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`904`	`904`	`public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)`
`905`	`905`	`{`
`906`	`906`	`var shader = Viewer.MaterialManager.SceneryShader;`
`907`		`- var viewProj = XNAViewMatrix * XNAProjectionMatrix;`
`908`	`907`
`909`	`908`	`ShaderPasses.Reset();`
`910`	`909`	`while (ShaderPasses.MoveNext())`
`911`	`910`	`{`
`912`	`911`	`foreach (var item in renderItems)`
`913`	`912`	`{`
`914`		`- shader.SetMatrix(item.XNAMatrix, ref viewProj);`
	`913`	`+ shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);`
`915`	`914`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`916`	`915`	`ShaderPasses.Current.Apply();`
`917`	`916`
Original file line number	Diff line number	Diff line change
`@@ -694,14 +694,12 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`694`	`694`
`695`	`695`	`public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)`
`696`	`696`	`{`
`697`		`- var viewProj = XNAViewMatrix * XNAProjectionMatrix;`
`698`		`-`
`699`	`697`	`foreach (var pass in SceneryShader.CurrentTechnique.Passes)`
`700`	`698`	`{`
`701`	`699`	`foreach (var item in renderItems)`
`702`	`700`	`{`
`703`	`701`	`SceneryShader.SignalLightIntensity = (item.ItemData as SignalLightState).GetIntensity();`
`704`		`- SceneryShader.SetMatrix(item.XNAMatrix, ref viewProj);`
	`702`	`+ SceneryShader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);`
`705`	`703`	`pass.Apply();`
`706`	`704`	`item.RenderPrimitive.Draw(graphicsDevice);`
`707`	`705`	`}`
`@@ -752,16 +750,14 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`752`	`750`
`753`	`751`	`public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)`
`754`	`752`	`{`
`755`		`- var viewProj = XNAViewMatrix * XNAProjectionMatrix;`
`756`		`-`
`757`	`753`	`foreach (var pass in SceneryShader.CurrentTechnique.Passes)`
`758`	`754`	`{`
`759`	`755`	`foreach (var item in renderItems)`
`760`	`756`	`{`
`761`	`757`	`var slp = item.RenderPrimitive as SignalLightPrimitive;`
`762`	`758`	`SceneryShader.ZBias = MathHelper.Lerp(slp.GlowIntensityDay, slp.GlowIntensityNight, NightEffect);`
`763`	`759`	`SceneryShader.SignalLightIntensity = (item.ItemData as SignalLightState).GetIntensity();`
`764`		`- SceneryShader.SetMatrix(item.XNAMatrix, ref viewProj);`
	`760`	`+ SceneryShader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);`
`765`	`761`	`pass.Apply();`
`766`	`762`	`item.RenderPrimitive.Draw(graphicsDevice);`
`767`	`763`	`}`
Original file line number	Diff line number	Diff line change
`@@ -530,14 +530,13 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`530`	`530`	`public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)`
`531`	`531`	`{`
`532`	`532`	`var shader = Viewer.MaterialManager.SceneryShader;`
`533`		`- var viewproj = XNAViewMatrix * XNAProjectionMatrix;`
`534`	`533`
`535`	`534`	`ShaderPasses.Reset();`
`536`	`535`	`while (ShaderPasses.MoveNext())`
`537`	`536`	`{`
`538`	`537`	`foreach (var item in renderItems)`
`539`	`538`	`{`
`540`		`- shader.SetMatrix(item.XNAMatrix, ref viewproj);`
	`539`	`+ shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);`
`541`	`540`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`542`	`541`	`ShaderPasses.Current.Apply();`
`543`	`542`	`// SamplerStates can only be set after the ShaderPasses.Current.Apply().`
Original file line number	Diff line number	Diff line change
`@@ -178,15 +178,14 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`178`	`178`	`public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)`
`179`	`179`	`{`
`180`	`180`	`var shader = Viewer.MaterialManager.SceneryShader;`
`181`		`- var viewproj = XNAViewMatrix * XNAProjectionMatrix;`
`182`	`181`
`183`	`182`	`shader.SetViewMatrix(ref XNAViewMatrix);`
`184`	`183`	`ShaderPasses.Reset();`
`185`	`184`	`while (ShaderPasses.MoveNext())`
`186`	`185`	`{`
`187`	`186`	`foreach (var item in renderItems)`
`188`	`187`	`{`
`189`		`- shader.SetMatrix(item.XNAMatrix, ref viewproj);`
	`188`	`+ shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);`
`190`	`189`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`191`	`190`	`ShaderPasses.Current.Apply();`
`192`	`191`	`// SamplerStates can only be set after the ShaderPasses.Current.Apply().`
Original file line number	Diff line number	Diff line change
`@@ -185,14 +185,13 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`185`	`185`	`public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)`
`186`	`186`	`{`
`187`	`187`	`var shader = Viewer.MaterialManager.SceneryShader;`
`188`		`- var viewproj = XNAViewMatrix * XNAProjectionMatrix;`
`189`	`188`
`190`	`189`	`ShaderPasses.Reset();`
`191`	`190`	`while (ShaderPasses.MoveNext())`
`192`	`191`	`{`
`193`	`192`	`foreach (var item in renderItems)`
`194`	`193`	`{`
`195`		`- shader.SetMatrix(item.XNAMatrix, ref viewproj);`
	`194`	`+ shader.SetMatrix(item.XNAMatrix, ref XNAViewMatrix, ref XNAProjectionMatrix);`
`196`	`195`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`197`	`196`	`ShaderPasses.Current.Apply();`
`198`	`197`	`// SamplerStates can only be set after the ShaderPasses.Current.Apply().`