Paradigm change

Mistarin · Oct 14, 2021 · a714fb5 · a714fb5
1 parent ad7025d
commit a714fb5
Show file tree

Hide file tree

Showing 15 changed files with 397 additions and 1,105 deletions.
diff --git a/shaders/cAutoExposure.fx b/shaders/cAutoExposure.fx
@@ -22,6 +22,12 @@ uniform float _ManualBias <
 
 texture2D _RenderColor : COLOR;
 
+sampler2D _SampleColor
+{
+    Texture = _RenderColor;
+    SRGBTexture = TRUE;
+};
+
 texture2D _RenderLumaLOD
 {
     Width = 256;
@@ -30,12 +36,6 @@ texture2D _RenderLumaLOD
     Format = R16F;
 };
 
-sampler2D _SampleColor
-{
-    Texture = _RenderColor;
-    SRGBTexture = TRUE;
-};
-
 sampler2D _SampleLumaLOD
 {
     Texture = _RenderLumaLOD;

diff --git a/shaders/cBloom.fx b/shaders/cBloom.fx
@@ -25,23 +25,30 @@ uniform float _Intensity <
 > = 1.0;
 
 texture2D _RenderColor : COLOR;
-texture2D _RenderBloom1 { Width = BUFFER_WIDTH / 2;   Height = BUFFER_HEIGHT / 2;   Format = RGBA16F; };
-texture2D _RenderBloom2 { Width = BUFFER_WIDTH / 4;   Height = BUFFER_HEIGHT / 4;   Format = RGBA16F; };
-texture2D _RenderBloom3 { Width = BUFFER_WIDTH / 8;   Height = BUFFER_HEIGHT / 8;   Format = RGBA16F; };
-texture2D _RenderBloom4 { Width = BUFFER_WIDTH / 16;  Height = BUFFER_HEIGHT / 16;  Format = RGBA16F; };
-texture2D _RenderBloom5 { Width = BUFFER_WIDTH / 32;  Height = BUFFER_HEIGHT / 32;  Format = RGBA16F; };
-texture2D _RenderBloom6 { Width = BUFFER_WIDTH / 64;  Height = BUFFER_HEIGHT / 64;  Format = RGBA16F; };
-texture2D _RenderBloom7 { Width = BUFFER_WIDTH / 128; Height = BUFFER_HEIGHT / 128; Format = RGBA16F; };
-texture2D _RenderBloom8 { Width = BUFFER_WIDTH / 256; Height = BUFFER_HEIGHT / 256; Format = RGBA16F; };
-
 sampler2D _SampleColor { Texture = _RenderColor; SRGBTexture = TRUE; };
+
+texture2D _RenderBloom1 { Width = BUFFER_WIDTH / 2;   Height = BUFFER_HEIGHT / 2;   Format = RGBA16F; };
 sampler2D _SampleBloom1 { Texture = _RenderBloom1; };
+
+texture2D _RenderBloom2 { Width = BUFFER_WIDTH / 4;   Height = BUFFER_HEIGHT / 4;   Format = RGBA16F; };
 sampler2D _SampleBloom2 { Texture = _RenderBloom2; };
+
+texture2D _RenderBloom3 { Width = BUFFER_WIDTH / 8;   Height = BUFFER_HEIGHT / 8;   Format = RGBA16F; };
 sampler2D _SampleBloom3 { Texture = _RenderBloom3; };
+
+texture2D _RenderBloom4 { Width = BUFFER_WIDTH / 16;  Height = BUFFER_HEIGHT / 16;  Format = RGBA16F; };
 sampler2D _SampleBloom4 { Texture = _RenderBloom4; };
+
+texture2D _RenderBloom5 { Width = BUFFER_WIDTH / 32;  Height = BUFFER_HEIGHT / 32;  Format = RGBA16F; };
 sampler2D _SampleBloom5 { Texture = _RenderBloom5; };
+
+texture2D _RenderBloom6 { Width = BUFFER_WIDTH / 64;  Height = BUFFER_HEIGHT / 64;  Format = RGBA16F; };
 sampler2D _SampleBloom6 { Texture = _RenderBloom6; };
+
+texture2D _RenderBloom7 { Width = BUFFER_WIDTH / 128; Height = BUFFER_HEIGHT / 128; Format = RGBA16F; };
 sampler2D _SampleBloom7 { Texture = _RenderBloom7; };
+
+texture2D _RenderBloom8 { Width = BUFFER_WIDTH / 256; Height = BUFFER_HEIGHT / 256; Format = RGBA16F; };
 sampler2D _SampleBloom8 { Texture = _RenderBloom8; };
 
 /*

diff --git a/shaders/cBlur.fx b/shaders/cBlur.fx
diff --git a/shaders/cDifference.fx b/shaders/cDifference.fx
@@ -35,6 +35,13 @@ uniform float _Weight <
 
 texture2D _RenderColor : COLOR;
 
+sampler2D _SampleColor
+{
+    Texture = _RenderColor;
+    AddressU = MIRROR;
+    AddressV = MIRROR;
+};
+
 texture2D _RenderLOD  < pooled = false; >
 {
     Width = DSIZE.x;
@@ -43,13 +50,6 @@ texture2D _RenderLOD  < pooled = false; >
     Format = RGBA8;
 };
 
-sampler2D _SampleColor
-{
-    Texture = _RenderColor;
-    AddressU = MIRROR;
-    AddressV = MIRROR;
-};
-
 sampler2D _SampleLOD
 {
     Texture = _RenderLOD;

diff --git a/shaders/cFilmGrain.fx b/shaders/cFilmGrain.fx
@@ -28,7 +28,7 @@ void PostProcessVS(in uint ID : SV_VERTEXID, inout float4 Position : SV_POSITION
     Position = float4(TexCoord * float2(2.0, -2.0) + float2(-1.0, 1.0), 0.0, 1.0);
 }
 
-float Gaussian1D(float x, float Sigma)
+float GaussianWeight(float x, float Sigma)
 {
     const float Pi = 3.14159265359;
     Sigma = Sigma * Sigma;
@@ -40,7 +40,7 @@ float4 VignettePS(float4 Position : SV_POSITION, float2 TexCoord : TEXCOORD0) :
     float Time = rcp(1e+3 / _Time) * _Speed;
     float Seed = dot(Position.xy, float2(12.9898, 78.233));
     float Noise = frac(sin(Seed) * 43758.5453 + Time);
-    return Gaussian1D(Noise, _Variance) * _Intensity;
+    return GaussianWeight(Noise, _Variance) * _Intensity;
 }
 
 technique cGrain

diff --git a/shaders/cFrameBlending.fx b/shaders/cFrameBlending.fx
@@ -12,18 +12,18 @@ uniform float _BlendFactor <
 
 texture2D _RenderColor : COLOR;
 
-texture2D _RenderCopy
-{
-    Width = BUFFER_WIDTH;
-    Height = BUFFER_HEIGHT;
-};
-
 sampler2D _SampleColor
 {
     Texture = _RenderColor;
     SRGBTexture = TRUE;
 };
 
+texture2D _RenderCopy
+{
+    Width = BUFFER_WIDTH;
+    Height = BUFFER_HEIGHT;
+};
+
 sampler2D _SampleCopy
 {
     Texture = _RenderCopy;