Merge pull request #580 from pzgulyas/samplerstates

SamplerStates can only be set after the ShaderPasses.Current.Apply().

Author: cjakeman

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);
                 }
             }

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);
                 }
             }

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);
                 }
             }

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);
                 }
             }

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);
                 }
             }