Refactored MSVO - prep work for SRP integration

Author: Chman

PostProcessing/Editor/Effects/AmbientOcclusionEditor.cs

@@ -27,17 +27,25 @@ public override void OnEnable()
 
         public override void OnInspectorGUI()
         {
-            if (RuntimeUtilities.scriptableRenderPipelineActive)
+            int aoMode = m_Mode.value.intValue;
+
+            if (RuntimeUtilities.scriptableRenderPipelineActive && aoMode == (int)AmbientOcclusionMode.ScalableAmbientObscurance)
+            {
+                EditorGUILayout.HelpBox("Scalable ambient obscurance doesn't work with scriptable render pipelines.", MessageType.Warning);
+                return;
+            }
+
+#if !UNITY_2017_1_OR_NEWER
+            if (aoMode == (int)AmbientOcclusionMode.MultiScaleVolumetricObscurance)
             {
-                EditorGUILayout.HelpBox("This effect doesn't work with scriptable render pipelines yet.", MessageType.Warning);
+                EditorGUILayout.HelpBox("Multi-scale volumetric obscurance requires Unity 2017.1 or more.", MessageType.Warning);
                 return;
             }
+#endif
 
             PropertyField(m_Mode);
             PropertyField(m_Intensity);
 
-            int aoMode = m_Mode.value.intValue;
-
             if (aoMode == (int)AmbientOcclusionMode.ScalableAmbientObscurance)
             {
                 PropertyField(m_Radius);

PostProcessing/Runtime/Effects/AmbientOcclusion.cs

@@ -28,7 +28,7 @@ public sealed class AmbientOcclusionQualityParameter : ParameterOverride<Ambient
     public sealed class AmbientOcclusion : PostProcessEffectSettings
     {
         // Shared parameters
-        [Tooltip("The ambient occlusion method to use. \"Modern\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
+        [Tooltip("The ambient occlusion method to use. \"MSVO\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
         public AmbientOcclusionModeParameter mode = new AmbientOcclusionModeParameter { value = AmbientOcclusionMode.MultiScaleVolumetricObscurance };
 
         [Range(0f, 4f), Tooltip("Degree of darkness added by ambient occlusion.")]
@@ -63,11 +63,23 @@ public sealed class AmbientOcclusion : PostProcessEffectSettings
         public override bool IsEnabledAndSupported(PostProcessRenderContext context)
         {
             bool state = enabled.value
-                && intensity.value > 0f
-                && !RuntimeUtilities.scriptableRenderPipelineActive;
+                && intensity.value > 0f;
 
-            if (mode.value == AmbientOcclusionMode.MultiScaleVolumetricObscurance)
-                state &= SystemInfo.supportsComputeShaders && SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.RFloat);
+            if (mode.value == AmbientOcclusionMode.ScalableAmbientObscurance)
+            {
+                state &= !RuntimeUtilities.scriptableRenderPipelineActive;
+            }
+            else if (mode.value == AmbientOcclusionMode.MultiScaleVolumetricObscurance)
+            {
+#if UNITY_2017_1_OR_NEWER
+                state &= SystemInfo.supportsComputeShaders
+                      && SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.RFloat)
+                      && SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.RHalf)
+                      && SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.R8);
+#else
+                state = false;
+#endif
+            }
 
             return state;
         }
@@ -106,6 +118,13 @@ public bool IsAmbientOnly(PostProcessRenderContext context)
                 && camera.allowHDR;
         }
 
+        // This is a special case we need for SRP support on MSVO as we won't be able to rely on
+        // the context object passed around (it won't be defined by the time AO is rendered)
+        internal void SetResources(PostProcessResources resources)
+        {
+            ((MultiScaleVO)m_Methods[1]).SetResources(resources);
+        }
+
         public IAmbientOcclusionMethod Get()
         {
             return m_Methods[(int)settings.mode.value];