Merge pull request #580 from pzgulyas/samplerstates

cjakeman · web-flow · commit fcba3c7661a6 · 2022-02-19T11:30:27.000Z
SamplerStates can only be set after the ShaderPasses.Current.Apply().
diff --git a/Source/RunActivity/Viewer3D/Forest.cs b/Source/RunActivity/Viewer3D/Forest.cs
@@ -426,7 +426,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
 
             // Enable alpha blending for everything: this allows distance scenery to appear smoothly.
             graphicsDevice.BlendState = BlendState.NonPremultiplied;
-            graphicsDevice.SamplerStates[0] = SamplerState.LinearClamp;
         }
 
         public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
@@ -443,6 +442,10 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte
                     shader.SetMatrix(item.XNAMatrix, ref viewproj);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
+
+                    // SamplerStates can only be set after the ShaderPasses.Current.Apply().
+                    graphicsDevice.SamplerStates[0] = SamplerState.LinearClamp;
+
                     item.RenderPrimitive.Draw(graphicsDevice);
                 }
             }
diff --git a/Source/RunActivity/Viewer3D/Materials.cs b/Source/RunActivity/Viewer3D/Materials.cs
@@ -789,7 +789,6 @@ public bool LoadDayTexture ()
         public override void SetState(GraphicsDevice graphicsDevice, Material previousMaterial)
         {
             graphicsDevice.RasterizerState = RasterizerState.CullCounterClockwise;
-            graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
 
             var shader = Viewer.MaterialManager.SceneryShader;
             var level9_3 = Viewer.Settings.IsDirectXFeatureLevelIncluded(ORTS.Settings.UserSettings.DirectXFeature.Level9_3);
@@ -889,8 +888,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
                     throw new InvalidDataException("Options has unexpected SceneryMaterialOptions.SpecularMask value.");
             }
 
-            graphicsDevice.SamplerStates[0] = GetShadowTextureAddressMode();
-
             if (NightTexture != null && NightTexture != SharedMaterialManager.MissingTexture && (((Options & SceneryMaterialOptions.UndergroundTexture) != 0 &&
                 (Viewer.MaterialManager.sunDirection.Y < -0.085f || Viewer.Camera.IsUnderground)) || Viewer.MaterialManager.sunDirection.Y < 0.0f - ((float)KeyLengthRemainder()) / 5000f))
             {
@@ -917,6 +914,10 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte
                     shader.SetMatrix(item.XNAMatrix, ref viewProj);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
+
+                    // SamplerStates can only be set after the ShaderPasses.Current.Apply().
+                    graphicsDevice.SamplerStates[0] = GetShadowTextureAddressMode();
+
                     item.RenderPrimitive.Draw(graphicsDevice);
                 }
             }
@@ -1059,8 +1060,9 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte
                 {
                     var wvp = item.XNAMatrix * viewproj;
                     shader.SetData(ref wvp, item.Material.GetShadowTexture());
-                    graphicsDevice.SamplerStates[0] = item.Material.GetShadowTextureAddressMode();
                     ShaderPasses.Current.Apply();
+                    // SamplerStates can only be set after the ShaderPasses.Current.Apply().
+                    graphicsDevice.SamplerStates[0] = item.Material.GetShadowTextureAddressMode();
                     item.RenderPrimitive.Draw(graphicsDevice);
                 }
             }
diff --git a/Source/RunActivity/Viewer3D/Terrain.cs b/Source/RunActivity/Viewer3D/Terrain.cs
@@ -524,7 +524,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
             shader.OverlayTexture = PatchTextureOverlay;
             shader.OverlayScale = OverlayScale;
 
-            graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
             graphicsDevice.BlendState = BlendState.NonPremultiplied;
         }
 
@@ -541,6 +540,8 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte
                     shader.SetMatrix(item.XNAMatrix, ref viewproj);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
+                    // SamplerStates can only be set after the ShaderPasses.Current.Apply().
+                    graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
                     item.RenderPrimitive.Draw(graphicsDevice);
                 }
             }
diff --git a/Source/RunActivity/Viewer3D/Transfers.cs b/Source/RunActivity/Viewer3D/Transfers.cs
@@ -171,7 +171,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
             shader.ImageTexture = Texture;
             shader.ReferenceAlpha = 10;
 
-            graphicsDevice.SamplerStates[0] = TransferSamplerState;
             graphicsDevice.BlendState = BlendState.NonPremultiplied;
             graphicsDevice.DepthStencilState = DepthStencilState.DepthRead;
         }
@@ -190,6 +189,8 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte
                     shader.SetMatrix(item.XNAMatrix, ref viewproj);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
+                    // SamplerStates can only be set after the ShaderPasses.Current.Apply().
+                    graphicsDevice.SamplerStates[0] = TransferSamplerState;
                     item.RenderPrimitive.Draw(graphicsDevice);
                 }
             }
diff --git a/Source/RunActivity/Viewer3D/Water.cs b/Source/RunActivity/Viewer3D/Water.cs
@@ -179,7 +179,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
             shader.ImageTexture = WaterTexture;
             shader.ReferenceAlpha = 10;
 
-            graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
             graphicsDevice.BlendState = BlendState.NonPremultiplied;
         }
 
@@ -196,6 +195,8 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte
                     shader.SetMatrix(item.XNAMatrix, ref viewproj);
                     shader.ZBias = item.RenderPrimitive.ZBias;
                     ShaderPasses.Current.Apply();
+                    // SamplerStates can only be set after the ShaderPasses.Current.Apply().
+                    graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
                     item.RenderPrimitive.Draw(graphicsDevice);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`426`	`426`
`427`	`427`	`// Enable alpha blending for everything: this allows distance scenery to appear smoothly.`
`428`	`428`	`graphicsDevice.BlendState = BlendState.NonPremultiplied;`
`429`		`- graphicsDevice.SamplerStates[0] = SamplerState.LinearClamp;`
`430`	`429`	`}`
`431`	`430`
`432`	`431`	`public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)`
`@@ -443,6 +442,10 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte`
`443`	`442`	`shader.SetMatrix(item.XNAMatrix, ref viewproj);`
`444`	`443`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`445`	`444`	`ShaderPasses.Current.Apply();`
	`445`	`+`
	`446`	`+ // SamplerStates can only be set after the ShaderPasses.Current.Apply().`
	`447`	`+ graphicsDevice.SamplerStates[0] = SamplerState.LinearClamp;`
	`448`	`+`
`446`	`449`	`item.RenderPrimitive.Draw(graphicsDevice);`
`447`	`450`	`}`
`448`	`451`	`}`
Original file line number	Diff line number	Diff line change
`@@ -789,7 +789,6 @@ public bool LoadDayTexture ()`
`789`	`789`	`public override void SetState(GraphicsDevice graphicsDevice, Material previousMaterial)`
`790`	`790`	`{`
`791`	`791`	`graphicsDevice.RasterizerState = RasterizerState.CullCounterClockwise;`
`792`		`- graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;`
`793`	`792`
`794`	`793`	`var shader = Viewer.MaterialManager.SceneryShader;`
`795`	`794`	`var level9_3 = Viewer.Settings.IsDirectXFeatureLevelIncluded(ORTS.Settings.UserSettings.DirectXFeature.Level9_3);`
`@@ -889,8 +888,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`889`	`888`	`throw new InvalidDataException("Options has unexpected SceneryMaterialOptions.SpecularMask value.");`
`890`	`889`	`}`
`891`	`890`
`892`		`- graphicsDevice.SamplerStates[0] = GetShadowTextureAddressMode();`
`893`		`-`
`894`	`891`	`if (NightTexture != null && NightTexture != SharedMaterialManager.MissingTexture && (((Options & SceneryMaterialOptions.UndergroundTexture) != 0 &&`
`895`	`892`	`(Viewer.MaterialManager.sunDirection.Y < -0.085f \|\| Viewer.Camera.IsUnderground)) \|\| Viewer.MaterialManager.sunDirection.Y < 0.0f - ((float)KeyLengthRemainder()) / 5000f))`
`896`	`893`	`{`
`@@ -917,6 +914,10 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte`
`917`	`914`	`shader.SetMatrix(item.XNAMatrix, ref viewProj);`
`918`	`915`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`919`	`916`	`ShaderPasses.Current.Apply();`
	`917`	`+`
	`918`	`+ // SamplerStates can only be set after the ShaderPasses.Current.Apply().`
	`919`	`+ graphicsDevice.SamplerStates[0] = GetShadowTextureAddressMode();`
	`920`	`+`
`920`	`921`	`item.RenderPrimitive.Draw(graphicsDevice);`
`921`	`922`	`}`
`922`	`923`	`}`
`@@ -1059,8 +1060,9 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte`
`1059`	`1060`	`{`
`1060`	`1061`	`var wvp = item.XNAMatrix * viewproj;`
`1061`	`1062`	`shader.SetData(ref wvp, item.Material.GetShadowTexture());`
`1062`		`- graphicsDevice.SamplerStates[0] = item.Material.GetShadowTextureAddressMode();`
`1063`	`1063`	`ShaderPasses.Current.Apply();`
	`1064`	`+ // SamplerStates can only be set after the ShaderPasses.Current.Apply().`
	`1065`	`+ graphicsDevice.SamplerStates[0] = item.Material.GetShadowTextureAddressMode();`
`1064`	`1066`	`item.RenderPrimitive.Draw(graphicsDevice);`
`1065`	`1067`	`}`
`1066`	`1068`	`}`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`524`	`524`	`shader.OverlayTexture = PatchTextureOverlay;`
`525`	`525`	`shader.OverlayScale = OverlayScale;`
`526`	`526`
`527`		`- graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;`
`528`	`527`	`graphicsDevice.BlendState = BlendState.NonPremultiplied;`
`529`	`528`	`}`
`530`	`529`
`@@ -541,6 +540,8 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte`
`541`	`540`	`shader.SetMatrix(item.XNAMatrix, ref viewproj);`
`542`	`541`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`543`	`542`	`ShaderPasses.Current.Apply();`
	`543`	`+ // SamplerStates can only be set after the ShaderPasses.Current.Apply().`
	`544`	`+ graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;`
`544`	`545`	`item.RenderPrimitive.Draw(graphicsDevice);`
`545`	`546`	`}`
`546`	`547`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`171`	`171`	`shader.ImageTexture = Texture;`
`172`	`172`	`shader.ReferenceAlpha = 10;`
`173`	`173`
`174`		`- graphicsDevice.SamplerStates[0] = TransferSamplerState;`
`175`	`174`	`graphicsDevice.BlendState = BlendState.NonPremultiplied;`
`176`	`175`	`graphicsDevice.DepthStencilState = DepthStencilState.DepthRead;`
`177`	`176`	`}`
`@@ -190,6 +189,8 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte`
`190`	`189`	`shader.SetMatrix(item.XNAMatrix, ref viewproj);`
`191`	`190`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`192`	`191`	`ShaderPasses.Current.Apply();`
	`192`	`+ // SamplerStates can only be set after the ShaderPasses.Current.Apply().`
	`193`	`+ graphicsDevice.SamplerStates[0] = TransferSamplerState;`
`193`	`194`	`item.RenderPrimitive.Draw(graphicsDevice);`
`194`	`195`	`}`
`195`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,6 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa`
`179`	`179`	`shader.ImageTexture = WaterTexture;`
`180`	`180`	`shader.ReferenceAlpha = 10;`
`181`	`181`
`182`		`- graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;`
`183`	`182`	`graphicsDevice.BlendState = BlendState.NonPremultiplied;`
`184`	`183`	`}`
`185`	`184`
`@@ -196,6 +195,8 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte`
`196`	`195`	`shader.SetMatrix(item.XNAMatrix, ref viewproj);`
`197`	`196`	`shader.ZBias = item.RenderPrimitive.ZBias;`
`198`	`197`	`ShaderPasses.Current.Apply();`
	`198`	`+ // SamplerStates can only be set after the ShaderPasses.Current.Apply().`
	`199`	`+ graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;`
`199`	`200`	`item.RenderPrimitive.Draw(graphicsDevice);`
`200`	`201`	`}`
`201`	`202`	`}`