CShade: Added generic transformation and texture addressing

papadanku · papadanku · commit 65c6e94d42cd · 2024-08-24T07:24:01.000-07:00
diff --git a/shaders/cAntiAliasing.fx b/shaders/cAntiAliasing.fx
@@ -17,8 +17,8 @@
 #define RELATIVE_THRESHOLD 0.125
 #define SUBPIXEL_BLENDING 0.75
 
-#include "shared/cShade.fxh"
 #include "shared/cColor.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 float SampleLuma(float2 Tex, float2 Offset, float2 Delta)
diff --git a/shaders/cAutoExposure.fx b/shaders/cAutoExposure.fx
@@ -45,7 +45,6 @@ uniform bool _DisplaySpotMeterMask <
 > = false;
 
 #include "shared/cMacros.fxh"
-#include "shared/cShade.fxh"
 #include "shared/cProcedural.fxh"
 
 #define INCLUDE_CCAMERA_INPUT
@@ -55,6 +54,7 @@ uniform bool _DisplaySpotMeterMask <
 #define INCLUDE_CTONEMAP_OUTPUT
 #include "shared/cTonemap.fxh"
 
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cBlend.fx b/shaders/cBlend.fx
@@ -1,6 +1,4 @@
 
-#include "shared/cShade.fxh"
-
 /*
     [Shader Options]
 */
@@ -21,6 +19,8 @@ uniform float3 _DestFactor <
     ui_type = "drag";
 > = 1.0;
 
+#include "shared/cShade.fxh"
+
 /*
     [Textures & Samplers]
 */
diff --git a/shaders/cBloom.fx b/shaders/cBloom.fx
@@ -108,7 +108,6 @@ uniform float _Level1Weight <
     ui_max = 1.0;
 > = 1.0;
 
-#include "shared/cShade.fxh"
 #include "shared/cBlur.fxh"
 #include "shared/cMath.fxh"
 
@@ -119,6 +118,7 @@ uniform float _Level1Weight <
 #define INCLUDE_CTONEMAP_OUTPUT
 #include "shared/cTonemap.fxh"
 
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 #ifndef USE_AUTOEXPOSURE
diff --git a/shaders/cCheckerBoard.fx b/shaders/cCheckerBoard.fx
@@ -27,8 +27,8 @@ uniform bool _InvertCheckerboard <
     ui_type = "radio";
 > = false;
 
-#include "shared/cShade.fxh"
 #include "shared/cMath.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cChromaticity.fx b/shaders/cChromaticity.fx
@@ -9,8 +9,8 @@ uniform int _Select <
     ui_items = "Length (XY)\0Length (XYZ)\0Average (XY)\0Average (XYZ)\0Sum (XY)\0Sum (XYZ)\0Max (XY)\0Max (XYZ)\0Ratio (XY)\0Spherical (XY)\0Hue-Saturation (HSI)\0Hue-Saturation (HSL)\0Hue-Saturation (HSV)\0CoCg (XY)\0CrCb (XY)\0";
 > = 0;
 
-#include "shared/cShade.fxh"
 #include "shared/cColor.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cCircles.fx b/shaders/cCircles.fx
@@ -7,7 +7,6 @@
     #define ENABLE_MONO 0
 #endif
 
-#include "shared/cShade.fxh"
 #include "shared/cMacros.fxh"
 #include "shared/cColor.fxh"
 #include "shared/cMath.fxh"
@@ -139,6 +138,7 @@ uniform float3 _BackColor <
     > = 0;
 #endif
 
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cColorBand.fx b/shaders/cColorBand.fx
@@ -16,8 +16,8 @@ uniform int _DitherMethod <
     ui_items = "None\0Hash\0Interleaved Gradient Noise\0";
 > = 0;
 
-#include "shared/cShade.fxh"
 #include "shared/cProcedural.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cContrastNormalization.fx b/shaders/cContrastNormalization.fx
@@ -5,9 +5,9 @@ uniform int _Select <
     ui_items = "Local Contrast Normalization\0Census Transform\0";
 > = 0;
 
-#include "shared/cShade.fxh"
 #include "shared/cColor.fxh"
 #include "shared/cMath.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cEnsor.fx b/shaders/cEnsor.fx
@@ -33,8 +33,8 @@ namespace cEnsor
         ui_items = "Output\0Mask\0";
     > = 0;
 
-    #include "shared/cShade.fxh"
     #include "shared/cColor.fxh"
+    #include "shared/cShade.fxh"
     #include "shared/cBlend.fxh"
 
     CREATE_TEXTURE_POOLED(TempTex0_RGBA8, BUFFER_SIZE_0, RGBA8, 8)
diff --git a/shaders/cGaussianBlur.fxh b/shaders/cGaussianBlur.fxh
@@ -10,8 +10,8 @@ uniform float _Sigma <
     ui_max = 16.0;
 > = 1.0;
 
-#include "shared/cShade.fxh"
 #include "shared/cBlur.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cGrayscale.fx b/shaders/cGrayscale.fx
@@ -9,8 +9,8 @@ uniform int _Select <
     ui_items = "Average\0Min\0Median\0Max\0Length\0Min+Max\0None\0";
 > = 0;
 
-#include "shared/cShade.fxh"
 #include "shared/cColor.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cImageSharpen.fx b/shaders/cImageSharpen.fx
@@ -52,8 +52,8 @@ uniform int _RenderMode <
     ui_items = "Render Image\0Render Mask\0";
 > = 0;
 
-#include "shared/cShade.fxh"
 #include "shared/fidelityfx/cCas.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 float4 PS_CasFilterNoScaling(CShade_VS2PS_Quad Input): SV_TARGET0
diff --git a/shaders/cLens.fx b/shaders/cLens.fx
@@ -81,8 +81,8 @@ uniform float _Vignette <
     ui_max = 2.0;
 > = 0.6;
 
-#include "shared/cShade.fxh"
 #include "shared/fidelityfx/cLens.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 float4 PS_Lens(CShade_VS2PS_Quad Input): SV_TARGET0
diff --git a/shaders/cMedian.fx b/shaders/cMedian.fx
@@ -1,7 +1,7 @@
 
-#include "shared/cShade.fxh"
 #include "shared/cBlur.fxh"
 #include "shared/cMath.fxh"
+#include "shared/cShade.fxh"
 
 #ifndef HIERARCHIAL_LEVELS
     #define HIERARCHIAL_LEVELS 5
diff --git a/shaders/cMotionBlur.fx b/shaders/cMotionBlur.fx
@@ -45,11 +45,11 @@ namespace cMotionBlur
         ui_type = "radio";
     > = false;
 
-    #include "shared/cShade.fxh"
     #include "shared/cColor.fxh"
     #include "shared/cBlur.fxh"
     #include "shared/cMotionEstimation.fxh"
     #include "shared/cProcedural.fxh"
+    #include "shared/cShade.fxh"
     #include "shared/cBlend.fxh"
 
     /*
@@ -88,12 +88,12 @@ namespace cMotionBlur
 
     float2 PS_PrefilterHBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
     {
-        return CBlur_GetPixelBlur(Input, SampleTempTex1, true).rg;
+        return CBlur_GetPixelBlur(Input.Tex0, SampleTempTex1, true).rg;
     }
 
     float2 PS_PrefilterVBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
     {
-        return CBlur_GetPixelBlur(Input, SampleTempTex2a, false).rg;
+        return CBlur_GetPixelBlur(Input.Tex0, SampleTempTex2a, false).rg;
     }
 
     // Run Lucas-Kanade
@@ -128,12 +128,12 @@ namespace cMotionBlur
     float4 PS_PostfilterHBlur(CShade_VS2PS_Quad Input, out float4 Copy : SV_TARGET0) : SV_TARGET1
     {
         Copy = tex2D(SampleTempTex2b, Input.Tex0.xy);
-        return float4(CBlur_GetPixelBlur(Input, SampleOFlowTex, true).rg, 0.0, 1.0);
+        return float4(CBlur_GetPixelBlur(Input.Tex0, SampleOFlowTex, true).rg, 0.0, 1.0);
     }
 
     float4 PS_PostfilterVBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
     {
-        return float4(CBlur_GetPixelBlur(Input, SampleTempTex2a, false).rg, 0.0, 1.0);
+        return float4(CBlur_GetPixelBlur(Input.Tex0, SampleTempTex2a, false).rg, 0.0, 1.0);
     }
 
     float4 PS_MotionBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
diff --git a/shaders/cNoiseBlur.fx b/shaders/cNoiseBlur.fx
@@ -54,10 +54,10 @@ uniform bool _InvertFalloff <
     ui_type = "radio";
 > = false;
 
-#include "shared/cShade.fxh"
-#include "shared/cProcedural.fxh"
-#include "shared/cMath.fxh"
 #include "shared/fidelityfx/cLens.fxh"
+#include "shared/cMath.fxh"
+#include "shared/cProcedural.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/cOpticalFlow.fx b/shaders/cOpticalFlow.fx
@@ -1,9 +1,4 @@
 
-#include "shared/cShade.fxh"
-#include "shared/cColor.fxh"
-#include "shared/cBlur.fxh"
-#include "shared/cMotionEstimation.fxh"
-
 /*
     MIT License
 
@@ -48,6 +43,11 @@ namespace cOpticalFlow
         ui_max = 0.9;
     > = 0.45;
 
+    #include "shared/cColor.fxh"
+    #include "shared/cBlur.fxh"
+    #include "shared/cMotionEstimation.fxh"
+    #include "shared/cShade.fxh"
+
     #ifndef RENDER_VELOCITY_STREAMS
         #define RENDER_VELOCITY_STREAMS 1
     #endif
@@ -170,12 +170,12 @@ namespace cOpticalFlow
 
     float2 PS_PrefilterHBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
     {
-        return CBlur_GetPixelBlur(Input, SampleTempTex1, true).rg;
+        return CBlur_GetPixelBlur(Input.Tex0, SampleTempTex1, true).rg;
     }
 
     float2 PS_PrefilterVBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
     {
-        return CBlur_GetPixelBlur(Input, SampleTempTex2a, false).rg;
+        return CBlur_GetPixelBlur(Input.Tex0, SampleTempTex2a, false).rg;
     }
 
     // Run Lucas-Kanade
@@ -210,12 +210,12 @@ namespace cOpticalFlow
     float4 PS_PostfilterHBlur(CShade_VS2PS_Quad Input, out float4 Copy : SV_TARGET0) : SV_TARGET1
     {
         Copy = tex2D(SampleTempTex2b, Input.Tex0.xy);
-        return float4(CBlur_GetPixelBlur(Input, SampleOFlowTex, true).rg, 0.0, 1.0);
+        return float4(CBlur_GetPixelBlur(Input.Tex0, SampleOFlowTex, true).rg, 0.0, 1.0);
     }
 
     float4 PS_PostfilterVBlur(CShade_VS2PS_Quad Input) : SV_TARGET0
     {
-        return float4(CBlur_GetPixelBlur(Input, SampleTempTex2a, false).rg, 0.0, 1.0);
+        return float4(CBlur_GetPixelBlur(Input.Tex0, SampleTempTex2a, false).rg, 0.0, 1.0);
     }
 
     float4 PS_Shading(CShade_VS2PS_Quad Input) : SV_TARGET0
diff --git a/shaders/cOverlay.fx b/shaders/cOverlay.fx
@@ -1,6 +1,4 @@
 
-#include "shared/cShade.fxh"
-
 /*
     [Shader Options]
 */
@@ -35,6 +33,8 @@ uniform float2 _MaskOffset <
     #define ENABLE_POINT_SAMPLING 1
 #endif
 
+#include "shared/cShade.fxh"
+
 /*
     [Textures & Samplers]
 */
diff --git a/shaders/cThreshold.fx b/shaders/cThreshold.fx
@@ -27,8 +27,8 @@ uniform float _Intensity <
     ui_min = 0.0;
 > = 1.0;
 
-#include "shared/cShade.fxh"
 #include "shared/cMath.fxh"
+#include "shared/cShade.fxh"
 #include "shared/cBlend.fxh"
 
 /*
diff --git a/shaders/kContour.fx b/shaders/kContour.fx
@@ -1,9 +1,4 @@
 
-#include "shared/cShade.fxh"
-#include "shared/cColor.fxh"
-#include "shared/cEdge.fxh"
-#include "shared/cBlend.fxh"
-
 /*
     MIT License
 
@@ -84,6 +79,11 @@ uniform int _DisplayMode <
     ui_items = "Output\0Mask\0";
 > = 0;
 
+#include "shared/cColor.fxh"
+#include "shared/cEdge.fxh"
+#include "shared/cShade.fxh"
+#include "shared/cBlend.fxh"
+
 /*
     [Pixel Shaders]
 */
@@ -113,9 +113,9 @@ float3 GetColor(float4 Input)
     }
 }
 
-float3 PS_Grad(CShade_VS2PS_Quad Input) : SV_TARGET0
+float4 PS_Grad(CShade_VS2PS_Quad Input) : SV_TARGET0
 {
-    float3 I = 0.0;
+    float4 I = 0.0;
 
     switch(_Method)
     {
@@ -148,13 +148,14 @@ float3 PS_Grad(CShade_VS2PS_Quad Input) : SV_TARGET0
 
     if (_DisplayMode == 1)
     {
-        return I;
+        return float4(I.rgb, _CShadeAlphaFactor);
     }
 
     // Thresholding
     I = I * _ColorSensitivity;
-    float3 Mask = saturate((I - _Threshold) * _InverseRange);
-    return lerp(BackgroundColor, _FrontColor.rgb, Mask * _FrontColor.a);
+    float4 Mask = saturate((I - _Threshold) * _InverseRange);
+    float3 Contour = lerp(BackgroundColor, _FrontColor.rgb, Mask * _FrontColor.a);
+    return CBlend_OutputChannels(float4(Contour, _CShadeAlphaFactor));
 }
 
 technique CShade_KinoContour
diff --git a/shaders/kDatamosh.fx b/shaders/kDatamosh.fx
diff --git a/shaders/shared/cBlur.fxh b/shaders/shared/cBlur.fxh
diff --git a/shaders/shared/cColor.fxh b/shaders/shared/cColor.fxh
diff --git a/shaders/shared/cShade.fxh b/shaders/shared/cShade.fxh
