Migrated from #84 and updated to be more standard

Author: SimonDarksideJ

NeonShooter/NeonShooter.Core/Content/Shaders/BloomCombine.fx

@@ -2,15 +2,45 @@
 // scene, using tweakable intensity levels and saturation.
 // This is the final step in applying a bloom postprocess.
 
-sampler BloomSampler : register(s0);
-sampler BaseSampler : register(s1);
+#if OPENGL
+	#define SV_POSITION POSITION
+	#define VS_SHADERMODEL vs_3_0
+	#define PS_SHADERMODEL ps_3_0
+#else
+	#define VS_SHADERMODEL vs_4_0_level_9_1
+	#define PS_SHADERMODEL ps_4_0_level_9_1
+#endif
+
+texture BloomTexture;
+texture BaseTexture;
+
+sampler2D BloomSampler = sampler_state
+{
+    Texture = <BloomTexture>;
+    Filter = Linear;
+    AddressU = clamp;
+    AddressV = clamp;
+};
+
+sampler2D BaseSampler = sampler_state
+{
+    Texture = <BaseTexture>;
+    Filter = Linear;
+    AddressU = clamp;
+    AddressV = clamp;
+};
 
 float BloomIntensity;
 float BaseIntensity;
 
 float BloomSaturation;
 float BaseSaturation;
 
+struct VS_OUTPUT
+{
+    float4 Position : SV_POSITION0;
+    float2 TexCoord : TEXCOORD0;
+};
 
 // Helper for modifying the saturation of a color.
 float4 AdjustSaturation(float4 color, float saturation)
@@ -23,11 +53,11 @@ float4 AdjustSaturation(float4 color, float saturation)
 }
 
 
-float4 PixelShaderFunction(float2 texCoord : TEXCOORD0) : COLOR0
+float4 PixelShaderFunction(VS_OUTPUT input) : SV_TARGET0
 {
     // Look up the bloom and original base image colors.
-    float4 bloom = tex2D(BloomSampler, texCoord);
-    float4 base = tex2D(BaseSampler, texCoord);
+    float4 bloom = tex2D(BloomSampler, input.TexCoord);
+    float4 base = tex2D(BaseSampler, input.TexCoord);
 
     // Adjust color saturation and intensity.
     bloom = AdjustSaturation(bloom, BloomSaturation) * BloomIntensity;
@@ -46,10 +76,6 @@ technique BloomCombine
 {
     pass Pass1
     {
-#if SM4		
-		PixelShader = compile ps_4_0_level_9_1 PixelShaderFunction();
-#else
-		PixelShader = compile ps_2_0 PixelShaderFunction();
-#endif
+        PixelShader = compile PS_SHADERMODEL PixelShaderFunction();
     }
 }

NeonShooter/NeonShooter.Core/Game/BloomComponent.cs

@@ -184,8 +184,7 @@ public override void Draw(GameTime gameTime)
             parameters["BaseIntensity"].SetValue(Settings.BaseIntensity);
             parameters["BloomSaturation"].SetValue(Settings.BloomSaturation);
             parameters["BaseSaturation"].SetValue(Settings.BaseSaturation);
-
-            GraphicsDevice.Textures[1] = sceneRenderTarget;
+            parameters["BaseTexture"].SetValue(sceneRenderTarget);
 
             Viewport viewport = GraphicsDevice.Viewport;
 

NeonShooter/NeonShooter.Core/NeonShooterGame.cs

@@ -25,7 +25,6 @@ public class NeonShooterGame: Microsoft.Xna.Framework.Game
 		BloomComponent bloom;
 
 		bool paused = false;
-
 
         public NeonShooterGame()
         {