Fixed fog issues with AO

Chman · Chman · commit ec0c9ee9fc4b · 2017-08-30T14:28:34.000+02:00
diff --git a/PostProcessing/Runtime/Effects/Fog.cs b/PostProcessing/Runtime/Effects/Fog.cs
@@ -28,23 +28,11 @@ internal void Render(PostProcessRenderContext context)
         {
             var sheet = context.propertySheets.Get(context.resources.shaders.deferredFog);
             sheet.ClearKeywords();
+
             var fogColor = RuntimeUtilities.isLinearColorSpace ? RenderSettings.fogColor.linear : RenderSettings.fogColor;
             sheet.properties.SetVector(ShaderIDs.FogColor, fogColor);
             sheet.properties.SetVector(ShaderIDs.FogParams, new Vector3(RenderSettings.fogDensity, RenderSettings.fogStartDistance, RenderSettings.fogEndDistance));
 
-            switch (RenderSettings.fogMode)
-            {
-                case FogMode.Linear:
-                    sheet.EnableKeyword("FOG_LINEAR");
-                    break;
-                case FogMode.Exponential:
-                    sheet.EnableKeyword("FOG_EXP");
-                    break;
-                case FogMode.ExponentialSquared:
-                    sheet.EnableKeyword("FOG_EXP2");
-                    break;
-            }
-
             var cmd = context.command;
             cmd.BlitFullscreenTriangle(context.source, context.destination, sheet, excludeSkybox ? 1 : 0);
         }
diff --git a/PostProcessing/Runtime/Effects/MultiScaleVO.cs b/PostProcessing/Runtime/Effects/MultiScaleVO.cs
@@ -531,23 +531,11 @@ public void RenderAfterOpaque(PostProcessRenderContext context)
             // Not needed in Deferred.
             if (context.camera.actualRenderingPath == RenderingPath.Forward && RenderSettings.fog)
             {
+                sheet.EnableKeyword("APPLY_FORWARD_FOG");
                 sheet.properties.SetVector(
                     ShaderIDs.FogParams,
                     new Vector3(RenderSettings.fogDensity, RenderSettings.fogStartDistance, RenderSettings.fogEndDistance)
                 );
-
-                switch (RenderSettings.fogMode)
-                {
-                    case FogMode.Linear:
-                        sheet.EnableKeyword("FOG_LINEAR");
-                        break;
-                    case FogMode.Exponential:
-                        sheet.EnableKeyword("FOG_EXP");
-                        break;
-                    case FogMode.ExponentialSquared:
-                        sheet.EnableKeyword("FOG_EXP2");
-                        break;
-                }
             }
 
             RebuildCommandBuffers(context);
diff --git a/PostProcessing/Runtime/Effects/ScalableAO.cs b/PostProcessing/Runtime/Effects/ScalableAO.cs
@@ -114,23 +114,11 @@ void Render(PostProcessRenderContext context, CommandBuffer cmd, int occlusionSo
             // Not needed in Deferred.
             if (context.camera.actualRenderingPath == RenderingPath.Forward && RenderSettings.fog)
             {
+                sheet.EnableKeyword("APPLY_FORWARD_FOG");
                 sheet.properties.SetVector(
                     ShaderIDs.FogParams,
                     new Vector3(RenderSettings.fogDensity, RenderSettings.fogStartDistance, RenderSettings.fogEndDistance)
                 );
-
-                switch (RenderSettings.fogMode)
-                {
-                    case FogMode.Linear:
-                        sheet.EnableKeyword("FOG_LINEAR");
-                        break;
-                    case FogMode.Exponential:
-                        sheet.EnableKeyword("FOG_EXP");
-                        break;
-                    case FogMode.ExponentialSquared:
-                        sheet.EnableKeyword("FOG_EXP2");
-                        break;
-                }
             }
 
             // Texture setup
diff --git a/PostProcessing/Shaders/Builtins/MultiScaleVO.shader b/PostProcessing/Shaders/Builtins/MultiScaleVO.shader
@@ -80,6 +80,7 @@ Shader "Hidden/PostProcessing/MultiScaleVO"
 
             HLSLPROGRAM
 
+                #pragma multi_compile _ APPLY_FORWARD_FOG
                 #pragma multi_compile _ FOG_LINEAR FOG_EXP FOG_EXP2
                 #pragma vertex Vert
                 #pragma fragment Frag
@@ -90,7 +91,7 @@ Shader "Hidden/PostProcessing/MultiScaleVO"
                     half ao = 1.0 - SAMPLE_TEXTURE2D(_MSVOcclusionTexture, sampler_MSVOcclusionTexture, texcoord).r;
 
                     // Apply fog when enabled (forward-only)
-                #if (FOG_LINEAR || FOG_EXP || FOG_EXP2)
+                #if (APPLY_FORWARD_FOG)
                     float d = Linear01Depth(SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, sampler_CameraDepthTexture, texcoord));
                     d = ComputeFogDistance(d);
                     ao *= ComputeFog(d);
diff --git a/PostProcessing/Shaders/Builtins/ScalableAO.hlsl b/PostProcessing/Shaders/Builtins/ScalableAO.hlsl
@@ -247,7 +247,7 @@ float4 FragAO(VaryingsDefault i) : SV_Target
     ao = PositivePow(ao * INTENSITY / SAMPLE_COUNT, kContrast);
 
     // Apply fog when enabled (forward-only)
-#if (FOG_LINEAR || FOG_EXP || FOG_EXP2)
+#if (APPLY_FORWARD_FOG)
     float d = Linear01Depth(SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, sampler_CameraDepthTexture, UnityStereoTransformScreenSpaceTex(uv)));
     d = ComputeFogDistance(d);
     ao *= ComputeFog(d);
diff --git a/PostProcessing/Shaders/Builtins/ScalableAO.shader b/PostProcessing/Shaders/Builtins/ScalableAO.shader
@@ -18,6 +18,7 @@ Shader "Hidden/PostProcessing/ScalableAO"
 
                 #pragma vertex VertDefault
                 #pragma fragment FragAO
+                #pragma multi_compile _ APPLY_FORWARD_FOG
                 #pragma multi_compile _ FOG_LINEAR FOG_EXP FOG_EXP2
                 #define SOURCE_DEPTH
                 #include "ScalableAO.hlsl"
@@ -32,6 +33,7 @@ Shader "Hidden/PostProcessing/ScalableAO"
 
                 #pragma vertex VertDefault
                 #pragma fragment FragAO
+                #pragma multi_compile _ APPLY_FORWARD_FOG
                 #pragma multi_compile _ FOG_LINEAR FOG_EXP FOG_EXP2
                 #define SOURCE_GBUFFER
                 #include "ScalableAO.hlsl"
@@ -54,7 +56,7 @@ Shader "Hidden/PostProcessing/ScalableAO"
             ENDHLSL
         }
 
-        // 4 - Separable blur (horizontal pass) with G-Buffer
+        // 3 - Separable blur (horizontal pass) with G-Buffer
         Pass
         {
             HLSLPROGRAM
@@ -69,7 +71,7 @@ Shader "Hidden/PostProcessing/ScalableAO"
             ENDHLSL
         }
 
-        // 5 - Separable blur (vertical pass)
+        // 4 - Separable blur (vertical pass)
         Pass
         {
             HLSLPROGRAM
@@ -82,7 +84,7 @@ Shader "Hidden/PostProcessing/ScalableAO"
             ENDHLSL
         }
 
-        // 6 - Final composition
+        // 5 - Final composition
         Pass
         {
             Blend Zero OneMinusSrcColor, Zero OneMinusSrcAlpha
@@ -96,7 +98,7 @@ Shader "Hidden/PostProcessing/ScalableAO"
             ENDHLSL
         }
 
-        // 7 - Final composition (ambient only mode)
+        // 6 - Final composition (ambient only mode)
         Pass
         {
             Blend Zero OneMinusSrcColor, Zero OneMinusSrcAlpha

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ Shader "Hidden/PostProcessing/ScalableAO"`
`18`	`18`
`19`	`19`	`#pragma vertex VertDefault`
`20`	`20`	`#pragma fragment FragAO`
	`21`	`+ #pragma multi_compile _ APPLY_FORWARD_FOG`
`21`	`22`	`#pragma multi_compile _ FOG_LINEAR FOG_EXP FOG_EXP2`
`22`	`23`	`#define SOURCE_DEPTH`
`23`	`24`	`#include "ScalableAO.hlsl"`
`@@ -32,6 +33,7 @@ Shader "Hidden/PostProcessing/ScalableAO"`
`32`	`33`
`33`	`34`	`#pragma vertex VertDefault`
`34`	`35`	`#pragma fragment FragAO`
	`36`	`+ #pragma multi_compile _ APPLY_FORWARD_FOG`
`35`	`37`	`#pragma multi_compile _ FOG_LINEAR FOG_EXP FOG_EXP2`
`36`	`38`	`#define SOURCE_GBUFFER`
`37`	`39`	`#include "ScalableAO.hlsl"`
`@@ -54,7 +56,7 @@ Shader "Hidden/PostProcessing/ScalableAO"`
`54`	`56`	`ENDHLSL`
`55`	`57`	`}`
`56`	`58`
`57`		`- // 4 - Separable blur (horizontal pass) with G-Buffer`
	`59`	`+ // 3 - Separable blur (horizontal pass) with G-Buffer`
`58`	`60`	`Pass`
`59`	`61`	`{`
`60`	`62`	`HLSLPROGRAM`
`@@ -69,7 +71,7 @@ Shader "Hidden/PostProcessing/ScalableAO"`
`69`	`71`	`ENDHLSL`
`70`	`72`	`}`
`71`	`73`
`72`		`- // 5 - Separable blur (vertical pass)`
	`74`	`+ // 4 - Separable blur (vertical pass)`
`73`	`75`	`Pass`
`74`	`76`	`{`
`75`	`77`	`HLSLPROGRAM`
`@@ -82,7 +84,7 @@ Shader "Hidden/PostProcessing/ScalableAO"`
`82`	`84`	`ENDHLSL`
`83`	`85`	`}`
`84`	`86`
`85`		`- // 6 - Final composition`
	`87`	`+ // 5 - Final composition`
`86`	`88`	`Pass`
`87`	`89`	`{`
`88`	`90`	`Blend Zero OneMinusSrcColor, Zero OneMinusSrcAlpha`
`@@ -96,7 +98,7 @@ Shader "Hidden/PostProcessing/ScalableAO"`
`96`	`98`	`ENDHLSL`
`97`	`99`	`}`
`98`	`100`
`99`		`- // 7 - Final composition (ambient only mode)`
	`101`	`+ // 6 - Final composition (ambient only mode)`
`100`	`102`	`Pass`
`101`	`103`	`{`
`102`	`104`	`Blend Zero OneMinusSrcColor, Zero OneMinusSrcAlpha`