Merge branch '3.8.4' of https://github.com/MonoGame/MonoGame.Samples into feature/NeonShoorter-bloom-patch

Author: SimonDarksideJ

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

@@ -1,46 +1,24 @@
+///-------------------------------------------------------------------------------------------------
+/// <remarks>   
+///     Charles Humphrey, 12/07/2025. 
+///     Fixes for DX implementation.
+/// </remarks>
+///-------------------------------------------------------------------------------------------------
+#include "PPVertexShader.fxh"
+
 // Pixel shader combines the bloom image with the original
 // scene, using tweakable intensity levels and saturation.
 // This is the final step in applying a bloom postprocess.
 
-#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
-
-Texture2D BloomTexture;
-Texture2D BaseTexture;
-
-SamplerState BloomSampler = sampler_state
-{
-    Texture = <BloomTexture>;
-    Filter = Linear;
-    AddressU = clamp;
-    AddressV = clamp;
-};
-
-SamplerState BaseSampler = sampler_state
-{
-    Texture = <BaseTexture>;
-    Filter = Linear;
-    AddressU = clamp;
-    AddressV = clamp;
-};
+sampler BloomSampler : register(s0);
+sampler BaseSampler : register(s1);
 
 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)
@@ -52,12 +30,17 @@ float4 AdjustSaturation(float4 color, float saturation)
     return lerp(grey, color, saturation);
 }
 
+///-------------------------------------------------------------------------------------------------
+/// <summary>   Function now uses correct vertex input structure for both OGL and DX </summary>
+///
+/// <remarks>   Charles Humphrey, 12/07/2025. </remarks>
+///-------------------------------------------------------------------------------------------------
 
-float4 PixelShaderFunction(VS_OUTPUT input) : SV_TARGET0
+float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
 {
     // Look up the bloom and original base image colors.
-    float4 bloom = BaseTexture.Sample(BloomSampler, input.TexCoord);
-    float4 base = BaseTexture.Sample(BaseSampler, input.TexCoord);
+    float4 bloom = tex2D(BloomSampler, input.TexCoord);
+    float4 base = tex2D(BaseSampler, input.TexCoord);
 
     // Adjust color saturation and intensity.
     bloom = AdjustSaturation(bloom, BloomSaturation) * BloomIntensity;

NeonShooter/NeonShooter.Core/Content/Shaders/BloomExtract.fx

@@ -1,43 +1,26 @@
-// Pixel shader extracts the brighter areas of an image.
-// This is the first step in applying a bloom postprocess.
+///-------------------------------------------------------------------------------------------------
+/// <remarks>   
+///     Charles Humphrey, 12/07/2025. 
+///     Fixes for DX implementation.
+/// </remarks>
+///-------------------------------------------------------------------------------------------------
+#include "PPVertexShader.fxh"
 
-#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 BaseTexture;
-
-sampler2D TextureSampler = sampler_state
-{
-    Texture = <BaseTexture>;
-    Filter = Linear;
-    AddressU = clamp;
-    AddressV = clamp;
-};
+sampler TextureSampler : register(s0);
 
 float BloomThreshold;
 
-struct VS_OUTPUT
+///-------------------------------------------------------------------------------------------------
+/// <summary>   Function now uses correct vertex input structure for both OGL and DX </summary>
+///
+/// <remarks>   Charles Humphrey, 12/07/2025. </remarks>
+///-------------------------------------------------------------------------------------------------
+float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
 {
-    float4 Position : SV_POSITION0;
-    float2 TexCoord : TEXCOORD0;
-};
-
-float4 PixelShaderFunction(VS_OUTPUT input) : COLOR0
-{
-    // Look up the original image color.
     float4 c = tex2D(TextureSampler, input.TexCoord);
-
-    // Adjust it to keep only values brighter than the specified threshold.
     return saturate((c - BloomThreshold) / (1 - BloomThreshold));
 }
 
-
 technique BloomExtract
 {
     pass Pass1

NeonShooter/NeonShooter.Core/Content/Shaders/GaussianBlur.fx

@@ -1,45 +1,41 @@
+///-------------------------------------------------------------------------------------------------
+/// <remarks>   
+///     Charles Humphrey, 12/07/2025. 
+///     Fixes for DX implementation.
+/// </remarks>
+///-------------------------------------------------------------------------------------------------
+#include "PPVertexShader.fxh"
+
 // Pixel shader applies a one dimensional gaussian blur filter.
 // This is used twice by the bloom postprocess, first to
 // blur horizontally, and then again to blur vertically.
 
-#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 BaseTexture;
-
-sampler2D TextureSampler = sampler_state
-{
-    Texture = <BaseTexture>;
-    Filter = Linear;
-    AddressU = clamp;
-    AddressV = clamp;
-};
+sampler TextureSampler : register(s0);
 
 #define SAMPLE_COUNT 15
 
 float2 SampleOffsets[SAMPLE_COUNT];
 float SampleWeights[SAMPLE_COUNT];
 
-struct VS_OUTPUT
-{
-    float4 Position : SV_POSITION0;
-    float2 TexCoord : TEXCOORD0;
-};
 
-float4 PixelShaderFunction(VS_OUTPUT input) : COLOR0
+///-------------------------------------------------------------------------------------------------
+/// <summary>   Function now uses correct vertex input structure for both OGL and DX </summary>
+///
+/// <remarks>   Charles Humphrey, 12/07/2025. </remarks>
+///-------------------------------------------------------------------------------------------------
+float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
 {
     float4 c = 0;
 
     // Combine a number of weighted image filter taps.
     for (int i = 0; i < SAMPLE_COUNT; i++)
     {
-        c += tex2D(TextureSampler, input.TexCoord + SampleOffsets[i]) * SampleWeights[i];
+        // Charles Humphrey, altered this to give a better effect with the blur. Was too heavy before.
+        // This should really be done where the offsets and weights are calculated.
+        c += tex2D(TextureSampler, input.TexCoord + SampleOffsets[i] * .0125) * SampleWeights[i] * 5;        
+        
+        // Was:
+        //c += tex2D(TextureSampler, input.TexCoord + SampleOffsets[i]) * SampleWeights[i];
     }
 
     return c;

NeonShooter/NeonShooter.Core/Content/Shaders/PPVertexShader.fxh

@@ -0,0 +1,24 @@
+///-------------------------------------------------------------------------------------------------
+/// <summary>   
+///     This header file is for used to ensure vertex patching in the DX build.
+/// </summary>
+///
+/// <remarks>   Charles Humphrey, 12/07/2025. </remarks>
+///-------------------------------------------------------------------------------------------------
+
+
+#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
+
+struct VertexShaderOutput
+{
+    float4 Position : SV_POSITION;
+    float4 Color : COLOR0;
+    float2 TexCoord : TEXCOORD0;
+};