Started working on proper alpha propagation

Chman · Chman · commit aee347859f8e · 2017-07-27T18:29:27.000+02:00
Unfinished, don't use yet
diff --git a/PostProcessing/Runtime/Effects/DepthOfField.cs b/PostProcessing/Runtime/Effects/DepthOfField.cs
@@ -31,6 +31,7 @@ public sealed class DepthOfField : PostProcessEffectSettings
     }
     
     // TODO: Look into minimum blur amount in the distance, right now it's lerped until a point
+    // TODO: Doesn't play nice with alpha propagation, see if it can be fixed without killing performances
     public sealed class DepthOfFieldRenderer : PostProcessEffectRenderer<DepthOfField>
     {
         enum Pass
diff --git a/PostProcessing/Shaders/Builtins/Bloom.shader b/PostProcessing/Shaders/Builtins/Bloom.shader
@@ -17,23 +17,23 @@ Shader "Hidden/PostProcessing/Bloom"
         // ----------------------------------------------------------------------------------------
         // Prefilter
 
-        half4 Prefilter(half3 color, float2 uv)
+        half4 Prefilter(half4 color, float2 uv)
         {
             half autoExposure = SAMPLE_TEXTURE2D(_AutoExposureTex, sampler_AutoExposureTex, uv).r;
             color *= autoExposure;
             color = QuadraticThreshold(color, _Threshold.x, _Threshold.yzw);
-            return half4(color, 1.0);
+            return color;
         }
 
         half4 FragPrefilter13(VaryingsDefault i) : SV_Target
         {
-            half3 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);
+            half4 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);
             return Prefilter(SafeHDR(color), i.texcoord);
         }
 
         half4 FragPrefilter4(VaryingsDefault i) : SV_Target
         {
-            half3 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);
+            half4 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);
             return Prefilter(SafeHDR(color), i.texcoord);
         }
 
@@ -42,34 +42,34 @@ Shader "Hidden/PostProcessing/Bloom"
 
         half4 FragDownsample13(VaryingsDefault i) : SV_Target
         {
-            half3 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);
-            return half4(color, 1.0);
+            half4 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);
+            return color;
         }
 
         half4 FragDownsample4(VaryingsDefault i) : SV_Target
         {
-            half3 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);
-            return half4(color, 1.0);
+            half4 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);
+            return color;
         }
 
         // ----------------------------------------------------------------------------------------
         // Upsample & combine
 
-        half4 Combine(half3 bloom, float2 uv)
+        half4 Combine(half4 bloom, float2 uv)
         {
-            half3 color = SAMPLE_TEXTURE2D(_BloomTex, sampler_BloomTex, uv).rgb;
-            return half4(bloom + color, 1.0);
+            half4 color = SAMPLE_TEXTURE2D(_BloomTex, sampler_BloomTex, uv);
+            return bloom + color;
         }
 
         half4 FragUpsampleTent(VaryingsDefault i) : SV_Target
         {
-            half3 bloom = UpsampleTent(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy, _SampleScale);
+            half4 bloom = UpsampleTent(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy, _SampleScale);
             return Combine(bloom, UnityStereoTransformScreenSpaceTex(i.texcoord));
         }
 
         half4 FragUpsampleBox(VaryingsDefault i) : SV_Target
         {
-            half3 bloom = UpsampleBox(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy, _SampleScale);
+            half4 bloom = UpsampleBox(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy, _SampleScale);
             return Combine(bloom, UnityStereoTransformScreenSpaceTex(i.texcoord));
         }
 
diff --git a/PostProcessing/Shaders/Builtins/DepthOfField.hlsl b/PostProcessing/Shaders/Builtins/DepthOfField.hlsl
@@ -226,20 +226,22 @@ half4 FragCombine(VaryingsDefault i) : SV_Target
     // Convert CoC to far field alpha value.
     float ffa = smoothstep(_MainTex_TexelSize.y * 2.0, _MainTex_TexelSize.y * 4.0, coc);
 
-    half3 color = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, i.texcoord).rgb;
+    half4 color = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, i.texcoord);
 
 #if defined(UNITY_COLORSPACE_GAMMA)
     color = SRGBToLinear(color);
 #endif
 
+    half alpha = Max3(dof.r, dof.g, dof.b);
+
     // lerp(lerp(color, dof, ffa), dof, dof.a)
-    color = lerp(color, dof.rgb, ffa + dof.a - ffa * dof.a);
+    color = lerp(color, float4(dof.rgb, alpha), ffa + dof.a - ffa * dof.a);
 
 #if defined(UNITY_COLORSPACE_GAMMA)
     color = LinearToSRGB(color);
 #endif
 
-    return half4(color, 1.0);
+    return color;
 }
 
 #endif // UNITY_POSTFX_DEPTH_OF_FIELD
diff --git a/PostProcessing/Shaders/Builtins/FinalPass.shader b/PostProcessing/Shaders/Builtins/FinalPass.shader
@@ -73,7 +73,7 @@ Shader "Hidden/PostProcessing/FinalPass"
             #endif
 
             color.rgb = Dither(color.rgb, i.texcoord);
-            return float4(color.rgb, 1.0);
+            return color;
         }
 
     ENDHLSL
diff --git a/PostProcessing/Shaders/Builtins/Uber.shader b/PostProcessing/Shaders/Builtins/Uber.shader
@@ -69,7 +69,7 @@ Shader "Hidden/PostProcessing/Uber"
             float2 uv = i.texcoord;
             float2 uvSPR = UnityStereoTransformScreenSpaceTex(i.texcoord);
             half autoExposure = SAMPLE_TEXTURE2D(_AutoExposureTex, sampler_AutoExposureTex, uv).r;
-            half3 color = (0.0).xxx;
+            half4 color = (0.0).xxxx;
 
             // Inspired by the method described in "Rendering Inside" [Playdead 2016]
             // https://twitter.com/pixelmager/status/717019757766123520
@@ -82,13 +82,13 @@ Shader "Hidden/PostProcessing/Uber"
                 int samples = clamp(int(length(_MainTex_TexelSize.zw * diff / 2.0)), 3, MAX_CHROMATIC_SAMPLES);
                 float2 delta = diff / samples;
                 float2 pos = uv;
-                half3 sum = (0.0).xxx, filterSum = (0.0).xxx;
+                half4 sum = (0.0).xxxx, filterSum = (0.0).xxxx;
 
                 for (int i = 0; i < samples; i++)
                 {
                     half t = (i + 0.5) / samples;
-                    half3 s = SAMPLE_TEXTURE2D_LOD(_MainTex, sampler_MainTex, UnityStereoTransformScreenSpaceTex(pos), 0).rgb;
-                    half3 filter = SAMPLE_TEXTURE2D_LOD(_ChromaticAberration_SpectralLut, sampler_ChromaticAberration_SpectralLut, float2(t, 0.0), 0).rgb;
+                    half4 s = SAMPLE_TEXTURE2D_LOD(_MainTex, sampler_MainTex, UnityStereoTransformScreenSpaceTex(pos), 0);
+                    half4 filter = half4(SAMPLE_TEXTURE2D_LOD(_ChromaticAberration_SpectralLut, sampler_ChromaticAberration_SpectralLut, float2(t, 0.0), 0).rgb, 1.0);
 
                     sum += s * filter;
                     filterSum += filter;
@@ -105,14 +105,14 @@ Shader "Hidden/PostProcessing/Uber"
                 float2 diff = end - uv;
                 float2 delta = diff / 3;
                 float2 pos = uv;
-                half3 sum = (0.0).xxx, filterSum = (0.0).xxx;
+                half4 sum = (0.0).xxxx, filterSum = (0.0).xxxx;
 
                 UNITY_UNROLL
                 for (int i = 0; i < 3; i++)
                 {
                     half t = (i + 0.5) / 3;
-                    half3 s = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, UnityStereoTransformScreenSpaceTex(pos)).rgb;
-                    half3 filter = SAMPLE_TEXTURE2D(_ChromaticAberration_SpectralLut, sampler_ChromaticAberration_SpectralLut, float2(t, 0.0)).rgb;
+                    half4 s = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, UnityStereoTransformScreenSpaceTex(pos));
+                    half4 filter = half4(SAMPLE_TEXTURE2D(_ChromaticAberration_SpectralLut, sampler_ChromaticAberration_SpectralLut, float2(t, 0.0)).rgb, 1.0);
 
                     sum += s * filter;
                     filterSum += filter;
@@ -123,7 +123,7 @@ Shader "Hidden/PostProcessing/Uber"
             }
             #else
             {
-                color = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, uvSPR).rgb;
+                color = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, uvSPR);
             }
             #endif
 
@@ -134,17 +134,17 @@ Shader "Hidden/PostProcessing/Uber"
             }
             #endif
 
-            color *= autoExposure;
+            color.rgb *= autoExposure;
 
             #if BLOOM
             {
-                half3 bloom = UpsampleTent(TEXTURE2D_PARAM(_BloomTex, sampler_BloomTex), uvSPR, _BloomTex_TexelSize.xy, _Bloom_Settings.x).rgb;
-                half3 dirt = SAMPLE_TEXTURE2D(_Bloom_DirtTex, sampler_Bloom_DirtTex, i.texcoord).rgb;
+                half4 bloom = UpsampleTent(TEXTURE2D_PARAM(_BloomTex, sampler_BloomTex), uvSPR, _BloomTex_TexelSize.xy, _Bloom_Settings.x);
+                half4 dirt = half4(SAMPLE_TEXTURE2D(_Bloom_DirtTex, sampler_Bloom_DirtTex, i.texcoord).rgb, 0.0);
 
                 // Additive bloom (artist friendly)
                 bloom *= _Bloom_Settings.y;
                 dirt *= _Bloom_Settings.z;
-                color += bloom * _Bloom_Color;
+                color += bloom * half4(_Bloom_Color, 1.0);
                 color += dirt * bloom;
             }
             #endif
@@ -157,39 +157,48 @@ Shader "Hidden/PostProcessing/Uber"
                     d.x *= lerp(1.0, _ScreenParams.x / _ScreenParams.y, _Vignette_Settings.w);
                     d = pow(saturate(d), _Vignette_Settings.z); // Roundness
                     half vfactor = pow(saturate(1.0 - dot(d, d)), _Vignette_Settings.y);
-                    color *= lerp(_Vignette_Color, (1.0).xxx, vfactor);
+                    color.rgb *= lerp(_Vignette_Color, (1.0).xxx, vfactor);
+                    color.a = lerp(1.0, color.a, vfactor);
                 }
                 else
                 {
                     half vfactor = SAMPLE_TEXTURE2D(_Vignette_Mask, sampler_Vignette_Mask, uv).a;
+
+                    #if !UNITY_COLORSPACE_GAMMA
+                    {
+                        vfactor = SRGBToLinear(vfactor);
+                    }
+                    #endif
+
                     half3 new_color = color * lerp(_Vignette_Color, (1.0).xxx, vfactor);
-                    color = lerp(color, new_color, _Vignette_Opacity);
+                    color.rgb = lerp(color, new_color, _Vignette_Opacity);
+                    color.a = lerp(1.0, color.a, vfactor);
                 }
             }
             #endif
 
             #if GRAIN
             {
-                float3 grain = SAMPLE_TEXTURE2D(_GrainTex, sampler_GrainTex, uvSPR * _Grain_Params2.xy + _Grain_Params2.zw).rgb;
+                half3 grain = SAMPLE_TEXTURE2D(_GrainTex, sampler_GrainTex, uvSPR * _Grain_Params2.xy + _Grain_Params2.zw).rgb;
 
                 // Noisiness response curve based on scene luminance
                 float lum = 1.0 - sqrt(Luminance(saturate(color)));
                 lum = lerp(1.0, lum, _Grain_Params1.x);
 
-                color += color * grain * _Grain_Params1.y * lum;
+                color.rgb += color.rgb * grain * _Grain_Params1.y * lum;
             }
             #endif
 
             #if COLOR_GRADING_HDR
             {
                 color *= _PostExposure; // Exposure is in ev units (or 'stops')
-                float3 colorLutSpace = saturate(LUT_SPACE_ENCODE(color));
-                color = ApplyLut3D(TEXTURE3D_PARAM(_Lut3D, sampler_Lut3D), colorLutSpace, _Lut3D_Params);
+                float3 colorLutSpace = saturate(LUT_SPACE_ENCODE(color.rgb));
+                color.rgb = ApplyLut3D(TEXTURE3D_PARAM(_Lut3D, sampler_Lut3D), colorLutSpace, _Lut3D_Params);
             }
             #elif COLOR_GRADING_LDR
             {
                 color = saturate(color);
-                color = ApplyLut2D(TEXTURE2D_PARAM(_Lut2D, sampler_Lut2D), color, _Lut2D_Params);
+                color.rgb = ApplyLut2D(TEXTURE2D_PARAM(_Lut2D, sampler_Lut2D), color.rgb, _Lut2D_Params);
             }
             #endif
 
@@ -198,14 +207,14 @@ Shader "Hidden/PostProcessing/Uber"
             #if FINALPASS
             {
                 color.rgb = Dither(color.rgb, i.texcoord);
-                output = half4(color, 1.0);
+                output = color;
             }
             #else
             {
                 // Put saturated luma in alpha for FXAA - higher quality than "green as luma" and
                 // necessary as RGB values will potentially still be HDR for the FXAA pass
                 half luma = Luminance(saturate(color));
-                output = half4(color, luma);
+                output = half4(color.rgb, luma);
             }
             #endif
 
diff --git a/PostProcessing/Shaders/Colors.hlsl b/PostProcessing/Shaders/Colors.hlsl
@@ -192,7 +192,7 @@ half Luminance(half4 linearRgba)
 // Quadratic color thresholding
 // curve = (threshold - knee, knee * 2, 0.25 / knee)
 //
-half3 QuadraticThreshold(half3 color, half threshold, half3 curve)
+half4 QuadraticThreshold(half4 color, half threshold, half3 curve)
 {
     // Pixel brightness
     half br = Max3(color.r, color.g, color.b);
diff --git a/PostProcessing/Shaders/Sampling.hlsl b/PostProcessing/Shaders/Sampling.hlsl
@@ -12,25 +12,25 @@
 // . . I . J . .
 // . K . L . M .
 // . . . . . . .
-half3 DownsampleBox13Tap(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texelSize)
+half4 DownsampleBox13Tap(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texelSize)
 {
-    half3 A = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-1.0, -1.0)).rgb;
-    half3 B = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 0.0, -1.0)).rgb;
-    half3 C = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 1.0, -1.0)).rgb;
-    half3 D = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-0.5, -0.5)).rgb;
-    half3 E = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 0.5, -0.5)).rgb;
-    half3 F = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-1.0,  0.0)).rgb;
-    half3 G = SAMPLE_TEXTURE2D(tex, samplerTex, uv                                 ).rgb;
-    half3 H = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 1.0,  0.0)).rgb;
-    half3 I = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-0.5,  0.5)).rgb;
-    half3 J = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 0.5,  0.5)).rgb;
-    half3 K = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-1.0,  1.0)).rgb;
-    half3 L = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 0.0,  1.0)).rgb;
-    half3 M = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 1.0,  1.0)).rgb;
+    half4 A = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-1.0, -1.0));
+    half4 B = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 0.0, -1.0));
+    half4 C = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 1.0, -1.0));
+    half4 D = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-0.5, -0.5));
+    half4 E = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 0.5, -0.5));
+    half4 F = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-1.0,  0.0));
+    half4 G = SAMPLE_TEXTURE2D(tex, samplerTex, uv                                 );
+    half4 H = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 1.0,  0.0));
+    half4 I = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-0.5,  0.5));
+    half4 J = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 0.5,  0.5));
+    half4 K = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2(-1.0,  1.0));
+    half4 L = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 0.0,  1.0));
+    half4 M = SAMPLE_TEXTURE2D(tex, samplerTex, uv + texelSize * float2( 1.0,  1.0));
 
     half2 div = (1.0 / 4.0) * half2(0.5, 0.125);
 
-    half3 o = (D + E + I + J) * div.x;
+    half4 o = (D + E + I + J) * div.x;
     o += (A + B + G + F) * div.y;
     o += (B + C + H + G) * div.y;
     o += (F + G + L + K) * div.y;
@@ -40,50 +40,50 @@ half3 DownsampleBox13Tap(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texe
 }
 
 // Standard box filtering
-half3 DownsampleBox4Tap(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texelSize)
+half4 DownsampleBox4Tap(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texelSize)
 {
     float4 d = texelSize.xyxy * float4(-1.0, -1.0, 1.0, 1.0);
 
-    half3 s;
-    s = (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xy)).rgb;
-    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zy)).rgb;
-    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xw)).rgb;
-    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zw)).rgb;
+    half4 s;
+    s =  (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xy));
+    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zy));
+    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xw));
+    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zw));
 
     return s * (1.0 / 4.0);
 }
 
 // 9-tap bilinear upsampler (tent filter)
-half3 UpsampleTent(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texelSize, float sampleScale)
+half4 UpsampleTent(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texelSize, float sampleScale)
 {
     float4 d = texelSize.xyxy * float4(1.0, 1.0, -1.0, 0.0) * sampleScale;
 
-    half3 s;
-    s =  SAMPLE_TEXTURE2D(tex, samplerTex, uv - d.xy).rgb;
-    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv - d.wy).rgb * 2.0;
-    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv - d.zy).rgb;
+    half4 s;
+    s =  SAMPLE_TEXTURE2D(tex, samplerTex, uv - d.xy);
+    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv - d.wy) * 2.0;
+    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv - d.zy);
 
-    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zw).rgb * 2.0;
-    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv       ).rgb * 4.0;
-    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xw).rgb * 2.0;
+    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zw) * 2.0;
+    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv       ) * 4.0;
+    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xw) * 2.0;
 
-    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zy).rgb;
-    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.wy).rgb * 2.0;
-    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xy).rgb;
+    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zy);
+    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.wy) * 2.0;
+    s += SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xy);
 
     return s * (1.0 / 16.0);
 }
 
 // Standard box filtering
-half3 UpsampleBox(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texelSize, float sampleScale)
+half4 UpsampleBox(TEXTURE2D_ARGS(tex, samplerTex), float2 uv, float2 texelSize, float sampleScale)
 {
     float4 d = texelSize.xyxy * float4(-1.0, -1.0, 1.0, 1.0) * (sampleScale * 0.5);
 
-    half3 s;
-    s = (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xy)).rgb;
-    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zy)).rgb;
-    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xw)).rgb;
-    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zw)).rgb;
+    half4 s;
+    s =  (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xy));
+    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zy));
+    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.xw));
+    s += (SAMPLE_TEXTURE2D(tex, samplerTex, uv + d.zw));
 
     return s * (1.0 / 4.0);
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public sealed class DepthOfField : PostProcessEffectSettings`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// TODO: Look into minimum blur amount in the distance, right now it's lerped until a point`
	`34`	`+ // TODO: Doesn't play nice with alpha propagation, see if it can be fixed without killing performances`
`34`	`35`	`public sealed class DepthOfFieldRenderer : PostProcessEffectRenderer<DepthOfField>`
`35`	`36`	`{`
`36`	`37`	`enum Pass`
Original file line number	Diff line number	Diff line change
`@@ -17,23 +17,23 @@ Shader "Hidden/PostProcessing/Bloom"`
`17`	`17`	`// ----------------------------------------------------------------------------------------`
`18`	`18`	`// Prefilter`
`19`	`19`
`20`		`- half4 Prefilter(half3 color, float2 uv)`
	`20`	`+ half4 Prefilter(half4 color, float2 uv)`
`21`	`21`	`{`
`22`	`22`	`half autoExposure = SAMPLE_TEXTURE2D(_AutoExposureTex, sampler_AutoExposureTex, uv).r;`
`23`	`23`	`color *= autoExposure;`
`24`	`24`	`color = QuadraticThreshold(color, _Threshold.x, _Threshold.yzw);`
`25`		`- return half4(color, 1.0);`
	`25`	`+ return color;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`half4 FragPrefilter13(VaryingsDefault i) : SV_Target`
`29`	`29`	`{`
`30`		`- half3 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);`
	`30`	`+ half4 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);`
`31`	`31`	`return Prefilter(SafeHDR(color), i.texcoord);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`half4 FragPrefilter4(VaryingsDefault i) : SV_Target`
`35`	`35`	`{`
`36`		`- half3 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);`
	`36`	`+ half4 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);`
`37`	`37`	`return Prefilter(SafeHDR(color), i.texcoord);`
`38`	`38`	`}`
`39`	`39`
`@@ -42,34 +42,34 @@ Shader "Hidden/PostProcessing/Bloom"`
`42`	`42`
`43`	`43`	`half4 FragDownsample13(VaryingsDefault i) : SV_Target`
`44`	`44`	`{`
`45`		`- half3 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);`
`46`		`- return half4(color, 1.0);`
	`45`	`+ half4 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);`
	`46`	`+ return color;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`half4 FragDownsample4(VaryingsDefault i) : SV_Target`
`50`	`50`	`{`
`51`		`- half3 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);`
`52`		`- return half4(color, 1.0);`
	`51`	`+ half4 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy);`
	`52`	`+ return color;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// ----------------------------------------------------------------------------------------`
`56`	`56`	`// Upsample & combine`
`57`	`57`
`58`		`- half4 Combine(half3 bloom, float2 uv)`
	`58`	`+ half4 Combine(half4 bloom, float2 uv)`
`59`	`59`	`{`
`60`		`- half3 color = SAMPLE_TEXTURE2D(_BloomTex, sampler_BloomTex, uv).rgb;`
`61`		`- return half4(bloom + color, 1.0);`
	`60`	`+ half4 color = SAMPLE_TEXTURE2D(_BloomTex, sampler_BloomTex, uv);`
	`61`	`+ return bloom + color;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`half4 FragUpsampleTent(VaryingsDefault i) : SV_Target`
`65`	`65`	`{`
`66`		`- half3 bloom = UpsampleTent(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy, _SampleScale);`
	`66`	`+ half4 bloom = UpsampleTent(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy, _SampleScale);`
`67`	`67`	`return Combine(bloom, UnityStereoTransformScreenSpaceTex(i.texcoord));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`half4 FragUpsampleBox(VaryingsDefault i) : SV_Target`
`71`	`71`	`{`
`72`		`- half3 bloom = UpsampleBox(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy, _SampleScale);`
	`72`	`+ half4 bloom = UpsampleBox(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), UnityStereoTransformScreenSpaceTex(i.texcoord), _MainTex_TexelSize.xy, _SampleScale);`
`73`	`73`	`return Combine(bloom, UnityStereoTransformScreenSpaceTex(i.texcoord));`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ Shader "Hidden/PostProcessing/FinalPass"`
`73`	`73`	`#endif`
`74`	`74`
`75`	`75`	`color.rgb = Dither(color.rgb, i.texcoord);`
`76`		`- return float4(color.rgb, 1.0);`
	`76`	`+ return color;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`ENDHLSL`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ half Luminance(half4 linearRgba)`
`192`	`192`	`// Quadratic color thresholding`
`193`	`193`	`// curve = (threshold - knee, knee * 2, 0.25 / knee)`
`194`	`194`	`//`
`195`		`-half3 QuadraticThreshold(half3 color, half threshold, half3 curve)`
	`195`	`+half4 QuadraticThreshold(half4 color, half threshold, half3 curve)`
`196`	`196`	`{`
`197`	`197`	`// Pixel brightness`
`198`	`198`	`half br = Max3(color.r, color.g, color.b);`