CBlend: Added debug option

README.md

@@ -57,7 +57,7 @@ CShade features shaders that filter images for aesthetics.
   > = 1.0;
   ```
 
-- In uniforms stored in `.fxh` header files, wrap `[ ]` around `ui_category`/`ui_label`
+- In uniforms stored in `.fxh` header files, wrap `[ ]` around `ui_category`
 
   ```md
   uniform float _CShadeExposureSmoothingSpeed <

shaders/cAntiAliasing.fx

@@ -7,10 +7,10 @@
     Copyright (C) LucasArts 2010-2011
 */
 
-uniform int _DisplayMode <
-    ui_label = "Display Mode";
-    ui_type = "radio";
-    ui_items = "Output\0Mask\0";
+uniform int _RenderMode <
+    ui_label = "Render Mode";
+    ui_type = "combo";
+    ui_items = "Render Image\0Render Mask\0";
 > = 0;
 
 #include "shared/cShade.fxh"
@@ -178,12 +178,12 @@ float4 PS_AntiAliasing(CShade_VS2PS_Quad Input) : SV_TARGET0
     float4 R = (4.0 * (R0 + R1 + R2 + R3) + Center + Top01 + Bottom01 + Left01 + Right01) / 25.0;
     Color = lerp(Color, Center, saturate(R.a * 3.0 - 1.5));
 
-    if (_DisplayMode == 1)
+    if (_RenderMode == 1)
     {
         return Center.a;
     }
 
-    return float4(Color.rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(Color.rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_AntiAliasing

shaders/cAutoExposure.fx

@@ -169,7 +169,7 @@ float3 PS_Exposure(CShade_VS2PS_Quad Input) : SV_TARGET0
         Output = lerp(Output, LumaIcon.rgb, LumaIcon.a);
     }
 
-    return float4(Output.rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(Output.rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_AutoExposure

shaders/cBilateral.fx

@@ -32,7 +32,7 @@ float4 PS_Bilateral(CShade_VS2PS_Quad Input) : SV_TARGET0
         }
     }
 
-    return float4(OutputColor / TotalWeight, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(OutputColor / TotalWeight, _CShadeAlphaFactor));
 }
 
 technique CShade_Bilateral

shaders/cBloom.fx

@@ -6,38 +6,44 @@
 uniform float _Frametime < source = "frametime"; >;
 
 uniform float _Threshold <
-    ui_category = "Bloom | Input";
+    ui_category = "Bloom | General";
     ui_label = "Threshold";
     ui_type = "slider";
     ui_min = 0.0;
     ui_max = 1.0;
 > = 0.8;
 
 uniform float _Smooth <
-    ui_category = "Bloom | Input";
+    ui_category = "Bloom | General";
     ui_label = "Smoothing";
     ui_type = "slider";
     ui_min = 0.0;
     ui_max = 1.0;
 > = 0.5;
 
 uniform float3 _ColorShift <
-    ui_category = "Bloom | Input";
+    ui_category = "Bloom | General";
     ui_label = "Color Shift (RGB)";
     ui_type = "color";
     ui_min = 0.0;
     ui_max = 1.0;
 > = 1.0;
 
 uniform float _Intensity <
-    ui_category = "Bloom | Input";
+    ui_category = "Bloom | General";
     ui_label = "Intensity";
     ui_type = "slider";
     ui_step = 0.001;
     ui_min = 0.0;
     ui_max = 1.0;
 > = 0.5;
 
+uniform int _RenderMode <
+    ui_label = "Render Mode";
+    ui_type = "combo";
+    ui_items = "Base + Bloom\0Bloom\0";
+> = 0;
+
 uniform float _Level8Weight <
     ui_category = "Bloom | Level Weights";
     ui_label = "Level 8";
@@ -229,9 +235,21 @@ float4 PS_Composite(CShade_VS2PS_Quad Input) : SV_TARGET0
 {
     float3 BaseColor = tex2D(CShade_SampleColorTex, Input.Tex0).rgb;
     float3 BloomColor = tex2D(SampleTempTex1, Input.Tex0).rgb;
-    float3 Color = CTonemap_ApplyOutputTonemap(BaseColor + (BloomColor * _Intensity));
 
-    return float4(Color, _CShadeAlphaFactor);
+    // Bloom composition
+    float3 Color = 0.0;
+    switch (_RenderMode)
+    {
+        case 0:
+            Color = BaseColor + (BloomColor * _Intensity);
+            break;
+        case 1:
+            Color = BloomColor * _Intensity;
+            break;
+    }
+    Color = CTonemap_ApplyOutputTonemap(Color);
+
+    return CBlend_OutputChannels(float4(Color, _CShadeAlphaFactor));
 }
 
 #define CREATE_PASS(VERTEX_SHADER, PIXEL_SHADER, RENDER_TARGET, IS_ADDITIVE) \

shaders/cCheckerBoard.fx

@@ -41,7 +41,7 @@ float4 PS_Checkerboard(CShade_VS2PS_Quad Input) : SV_TARGET0
     Checkerboard = _InvertCheckerboard ? 1.0 - Checkerboard : Checkerboard;
     Checkerboard = Checkerboard == 1.0 ? _Color1 : _Color2;
 
-    return float4(Checkerboard, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(Checkerboard, _CShadeAlphaFactor));
 }
 
 technique CShade_CheckerBoard

shaders/cChromaticity.fx

@@ -75,7 +75,7 @@ float4 PS_Chromaticity(CShade_VS2PS_Quad Input) : SV_TARGET0
             break;
     }
 
-    return float4(Chromaticity.rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(Chromaticity.rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_Chromaticity

shaders/cCircles.fx

@@ -297,7 +297,7 @@ float4 PS_Blit(CShade_VS2PS_Quad Input) : SV_TARGET0
         OutputColor = lerp(_BackColor, OutputColor, MainTiles.Value.y > _Crop.z * 2.0);
         OutputColor = lerp(_BackColor, OutputColor, MainTiles.Value.y < (_CircleAmount - _Crop.w * 2.0));
 
-        return float4(OutputColor.rgb, _CShadeAlphaFactor);
+        return CBlend_OutputChannels(float4(OutputColor.rgb, _CShadeAlphaFactor));
     }
 #else
     float4 PS_Circles(CShade_VS2PS_Quad Input) : SV_TARGET0
@@ -347,7 +347,7 @@ float4 PS_Blit(CShade_VS2PS_Quad Input) : SV_TARGET0
         CropChannel(OutputColor.g, 1, GreenChannel_Tiles, _GreenChannelCrop);
         CropChannel(OutputColor.b, 2, BlueChannel_Tiles, _BlueChannelCrop);
 
-        return float4(OutputColor.rgb, _CShadeAlphaFactor);
+        return CBlend_OutputChannels(float4(OutputColor.rgb, _CShadeAlphaFactor));
     }
 #endif
 

shaders/cColorBand.fx

@@ -46,7 +46,7 @@ float4 PS_Color(CShade_VS2PS_Quad Input) : SV_TARGET0
 
     ColorMap.rgb = floor(ColorMap.rgb * _Range) / (_Range);
 
-    return float4(ColorMap.rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(ColorMap.rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_ColorBand

shaders/cContrastNormalization.fx

@@ -76,10 +76,10 @@ float4 PS_ContrastNormalization(CShade_VS2PS_Quad Input) : SV_TARGET0
     {
         case 0:
             float4 LCN = GetLocalContrastNormalization(CShade_SampleColorTex, Input.Tex0);
-            return float4(((float3)CColor_GetLuma(LCN.rgb, 0) * 0.5) + 0.5, _CShadeAlphaFactor);
+            return CBlend_OutputChannels(float4(((float3)CColor_GetLuma(LCN.rgb, 0) * 0.5) + 0.5, _CShadeAlphaFactor));
         case 1:
             float4 CT = GetCensusTransform(CShade_SampleColorTex, Input.Tex0);
-            return float4((float3)CColor_GetLuma(CT.rgb, 0), _CShadeAlphaFactor);
+            return CBlend_OutputChannels(float4((float3)CColor_GetLuma(CT.rgb, 0), _CShadeAlphaFactor));
         default:
             return 0.5;
     }

shaders/cEnsor.fx

@@ -123,7 +123,7 @@ namespace cEnsor
             OutputColor = lerp(Color, Pixel, Mask);
         }
 
-        return float4(OutputColor.rgb, _CShadeAlphaFactor);
+        return CBlend_OutputChannels(float4(OutputColor.rgb, _CShadeAlphaFactor));
     }
 
     technique CShade_Censor

shaders/cFrameBlend.fx

@@ -33,7 +33,7 @@ float4 PS_Blend(CShade_VS2PS_Quad Input) : SV_TARGET0
 float4 PS_Display(CShade_VS2PS_Quad Input) : SV_TARGET0
 {
     // Display the buffer
-    return float4(tex2D(SampleBlendTex, Input.Tex0).rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(tex2D(SampleBlendTex, Input.Tex0).rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_FrameBlend

shaders/cGaussianBlur.fx

@@ -50,12 +50,12 @@ float4 GetGaussianBlur(float2 Tex, bool IsHorizontal)
 
 float4 PS_HGaussianBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
 {
-    return float4(GetGaussianBlur(Input.Tex0, true).rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(GetGaussianBlur(Input.Tex0, true).rgb, _CShadeAlphaFactor));
 }
 
 float4 PS_VGaussianBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
 {
-    return float4(GetGaussianBlur(Input.Tex0, false).rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(GetGaussianBlur(Input.Tex0, false).rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_HorizontalBlur

shaders/cGrayscale.fx

@@ -21,7 +21,7 @@ float4 PS_Luminance(CShade_VS2PS_Quad Input) : SV_TARGET0
 {
     float4 Color = tex2D(CShade_SampleColorTex, Input.Tex0);
     float3 Luma = CColor_GetLuma(Color.rgb, _Select);
-    return float4(Luma, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(Luma, _CShadeAlphaFactor));
 }
 
 technique CShade_Grayscale

shaders/cImageSharpen.fx

@@ -46,10 +46,10 @@ uniform float _Contrast <
     ui_max = 1.0;
 > = 0.0;
 
-uniform int _DisplayMode <
-    ui_label = "Display Mode";
-    ui_type = "radio";
-    ui_items = "Output\0Mask\0";
+uniform int _RenderMode <
+    ui_label = "Render Mode";
+    ui_type = "combo";
+    ui_items = "Render Image\0Render Mask\0";
 > = 0;
 
 #include "shared/cShade.fxh"
@@ -69,12 +69,12 @@ float4 PS_CasFilterNoScaling(CShade_VS2PS_Quad Input): SV_TARGET0
         _Contrast
     );
 
-    if (_DisplayMode == 1)
+    if (_RenderMode == 1)
     {
         OutputColor = OutputMask;
     }
 
-    return float4(OutputColor.rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(OutputColor.rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_ImageSharpen

shaders/cLens.fx

@@ -102,7 +102,7 @@ float4 PS_Lens(CShade_VS2PS_Quad Input): SV_TARGET0
         _Vignette,
         Seed
     );
-    return float4(OutputColor.rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(OutputColor.rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_Lens

shaders/cLetterBox.fx

@@ -30,7 +30,7 @@ float4 PS_Letterbox(CShade_VS2PS_Quad Input) : SV_TARGET0
     Input.Tex0 = (Input.Tex0 * 2.0) - 1.0;
     Input.Tex0 += _Offset;
     float2 Shaper = step(abs(Input.Tex0), _Scale);
-    return float4(Shaper.xxx * Shaper.yyy, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(Shaper.xxx * Shaper.yyy, _CShadeAlphaFactor));
 }
 
 #undef CBLEND_BLENDENABLE

shaders/cMotionBlur.fx

@@ -160,7 +160,7 @@ namespace cMotionBlur
             OutputColor += tex2D(CShade_SampleColorTex, RandomTex);
         }
 
-        return float4(OutputColor.rgb / Samples, _CShadeAlphaFactor);
+        return CBlend_OutputChannels(float4(OutputColor.rgb / Samples, _CShadeAlphaFactor));
     }
 
     #define CREATE_PASS(VERTEX_SHADER, PIXEL_SHADER, RENDER_TARGET) \

shaders/cNoiseBlur.fx

@@ -112,7 +112,7 @@ float4 PS_NoiseBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
         }
     }
 
-    return float4(OutputColor.rgb / Weight, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(OutputColor.rgb / Weight, _CShadeAlphaFactor));
 }
 
 technique CShade_NoiseBlur

shaders/cPixelate.fx

@@ -22,7 +22,7 @@ float4 PS_Color(CShade_VS2PS_Quad Input) : SV_TARGET0
     float2 Tex = floor(Input.Tex0 * _Pixels) / _Pixels;
     float4 OutputColor = tex2D(CShade_SampleColorTex, Tex);
 
-    return float4(OutputColor.rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(OutputColor.rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_Pixelate

shaders/cSolidColor.fx

@@ -1,24 +1,20 @@
 
-#include "shared/cShade.fxh"
-#include "shared/cBlend.fxh"
-
-/*
-    [Shader Options]
-*/
-
 uniform float3 _Color <
     ui_label = "Color";
     ui_type = "color";
     ui_min = 0.0;
 > = 1.0;
 
+#include "shared/cShade.fxh"
+#include "shared/cBlend.fxh"
+
 /*
     [Pixel Shaders]
 */
 
 float4 PS_Color(CShade_VS2PS_Quad Input) : SV_TARGET0
 {
-    return float4(_Color, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(_Color, _CShadeAlphaFactor));
 }
 
 // Use BlendOp to multiple the backbuffer with this quad's color

shaders/cThreshold.fx

@@ -49,7 +49,7 @@ float4 PS_Threshold(CShade_VS2PS_Quad Input) : SV_TARGET0
     // Combine and apply the brightness response curve
     Color = Color * max(ResponseCurve, Brightness - _Threshold) / max(Brightness, 1e-10);
     Brightness = CMath_Med3(Color.r, Color.g, Color.b).a;
-    return float4(saturate(lerp(Brightness, Color.rgb, _Saturation) * _Intensity), _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(saturate(lerp(Brightness, Color.rgb, _Saturation) * _Intensity), _CShadeAlphaFactor));
 }
 
 technique CShade_Threshold

shaders/cTransform.fx

@@ -72,7 +72,7 @@ CShade_VS2PS_Quad VS_Matrix(CShade_APP2VS Input)
 
 float4 PS_Matrix(CShade_VS2PS_Quad Input) : SV_TARGET0
 {
-    return float4(tex2D(CShade_SampleColorTex, Input.Tex0).rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(tex2D(CShade_SampleColorTex, Input.Tex0).rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_Transform

shaders/kDatamosh.fx

@@ -303,7 +303,7 @@ namespace kDatamosh
         CW = lerp(CW, 1.0, Rand.w < lerp(0.2, 1.0, Quality) * (Disp > (1.0 - 1e-3)));
 
         // If the conditions above are not met, choose work.
-        return float4(lerp(Work.rgb, Source.rgb, CW), _CShadeAlphaFactor);
+        return CBlend_OutputChannels(float4(lerp(Work.rgb, Source.rgb, CW), _CShadeAlphaFactor));
     }
 
     float4 PS_CopyColorTex(CShade_VS2PS_Quad Input) : SV_TARGET0

shaders/kMirror.fx

@@ -71,7 +71,7 @@ float4 PS_Mirror(CShade_VS2PS_Quad Input) : SV_TARGET0
 
     // Reflection at the border of the screen.
     Input.Tex0 = max(min(Input.Tex0, 2.0 - Input.Tex0), -Input.Tex0);
-    return float4(tex2D(CShade_SampleColorTex, Input.Tex0).rgb, _CShadeAlphaFactor);
+    return CBlend_OutputChannels(float4(tex2D(CShade_SampleColorTex, Input.Tex0).rgb, _CShadeAlphaFactor));
 }
 
 technique CShade_KinoMirror