Fixed ReloadBaseTypes being called 2 times when entering play mode

.gitattributes

@@ -0,0 +1,16 @@
+## Unity ##
+
+*.cs diff=csharp text eol=crlf
+*.cginc text
+*.shader text
+
+
+*.mat merge=unityyamlmerge eol=lf
+*.anim merge=unityyamlmerge eol=lf
+*.unity merge=unityyamlmerge eol=lf
+*.prefab merge=unityyamlmerge eol=lf
+*.physicsMaterial2D merge=unityyamlmerge eol=lf
+*.physicsMaterial merge=unityyamlmerge eol=lf
+*.asset merge=unityyamlmerge eol=lf
+*.meta merge=unityyamlmerge eol=lf
+*.controller merge=unityyamlmerge eol=lf

PostProcessing/Editor/Effects/AmbientOcclusionEditor.cs

@@ -11,6 +11,8 @@ internal sealed class AmbientOcclusionEditor : PostProcessEffectEditor<AmbientOc
         SerializedParameterOverride m_Color;
         SerializedParameterOverride m_AmbientOnly;
         SerializedParameterOverride m_ThicknessModifier;
+        SerializedParameterOverride m_ZBias;
+        SerializedParameterOverride m_disableOnVRCameras;
         SerializedParameterOverride m_DirectLightingStrength;
         SerializedParameterOverride m_Quality;
         SerializedParameterOverride m_Radius;
@@ -22,6 +24,8 @@ public override void OnEnable()
             m_Color = FindParameterOverride(x => x.color);
             m_AmbientOnly = FindParameterOverride(x => x.ambientOnly);
             m_ThicknessModifier = FindParameterOverride(x => x.thicknessModifier);
+            m_ZBias = FindParameterOverride(x => x.zBias);
+            m_disableOnVRCameras = FindParameterOverride(x => x.disableOnVRCameras);
             m_DirectLightingStrength = FindParameterOverride(x => x.directLightingStrength);
             m_Quality = FindParameterOverride(x => x.quality);
             m_Radius = FindParameterOverride(x => x.radius);
@@ -47,13 +51,20 @@ public override void OnInspectorGUI()
             }
             else if (aoMode == (int)AmbientOcclusionMode.MultiScaleVolumetricObscurance)
             {
-                if (!SystemInfo.supportsComputeShaders)
-                    EditorGUILayout.HelpBox("Multi-scale volumetric obscurance requires compute shader support.", MessageType.Warning);
+                if (!SystemInfo.supportsComputeShaders || EditorUtilities.isTargetingWebGL)
+                {
+                    EditorGUILayout.HelpBox("Multi-scale volumetric obscurance requires compute shader support which is not available on this platform.", MessageType.Error);
+                }
+                else if(EditorUtilities.isTargetingAndroid)
+                {
+                    EditorGUILayout.HelpBox("Multi-scale volumetric obscurance requires compute shader support (Vulkan) when running on Android.", MessageType.Warning);
+                }
 
                 PropertyField(m_ThicknessModifier);
-
+                PropertyField(m_ZBias);
                 if (RuntimeUtilities.scriptableRenderPipelineActive)
                     PropertyField(m_DirectLightingStrength);
+                PropertyField(m_disableOnVRCameras);
             }
 
             PropertyField(m_Color);

PostProcessing/Editor/Effects/AutoExposureEditor.cs

@@ -31,8 +31,14 @@ public override void OnEnable()
 
         public override void OnInspectorGUI()
         {
-            if (!SystemInfo.supportsComputeShaders)
-                EditorGUILayout.HelpBox("Auto exposure requires compute shader support.", MessageType.Warning);
+            if (!SystemInfo.supportsComputeShaders || EditorUtilities.isTargetingWebGL)
+            {
+                EditorGUILayout.HelpBox("Auto exposure requires compute shader support which is not available on this platform.", MessageType.Error);
+            }
+            else if (EditorUtilities.isTargetingAndroid)
+            {
+                EditorGUILayout.HelpBox("Auto exposure requires compute shader support (Vulkan) when running on Android.", MessageType.Warning);
+            }
 
             EditorUtilities.DrawHeaderLabel("Exposure");
 

PostProcessing/Editor/Effects/BloomEditor.cs

@@ -54,7 +54,7 @@ public override void OnInspectorGUI()
             PropertyField(m_DirtTexture);
             PropertyField(m_DirtIntensity);
 
-            if (RuntimeUtilities.isVREnabled)
+            if (EditorUtilities.isVREnabled)
             {
                 if ((m_DirtIntensity.overrideState.boolValue && m_DirtIntensity.value.floatValue > 0f)
                  || (m_DirtTexture.overrideState.boolValue && m_DirtTexture.value.objectReferenceValue != null))

PostProcessing/Editor/Effects/ColorGradingEditor.cs

@@ -631,7 +631,7 @@ void DoCurvesGUI(bool hdr)
 
                     for (int i = 1; i < hLines; i++)
                     {
-                        var offset = i * Vector2.right * gridOffset;
+                        var offset = gridOffset * i * Vector2.right;
                         offset.x += gridPadding;
                         Handles.DrawLine(innerRect.position + offset, new Vector2(innerRect.x, innerRect.yMax - 1) + offset);
                     }
@@ -642,7 +642,7 @@ void DoCurvesGUI(bool hdr)
 
                     for (int i = 1; i < vLines; i++)
                     {
-                        var offset = i * Vector2.up * gridOffset;
+                        var offset = gridOffset * i * Vector2.up;
                         offset.y += gridPadding;
                         Handles.DrawLine(innerRect.position + offset, new Vector2(innerRect.xMax - 1, innerRect.y) + offset);
                     }

PostProcessing/Editor/Effects/DefaultPostProcessEffectEditor.cs

@@ -23,11 +23,9 @@ public override void OnEnable()
 
             var fields = target.GetType()
                 .GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
-                .Where(t => t.FieldType.IsSubclassOf(typeof(ParameterOverride)) && t.Name != "enabled")
-                .Where(t =>
-                    (t.IsPublic && t.GetCustomAttributes(typeof(NonSerializedAttribute), false).Length == 0)
-                    || (t.GetCustomAttributes(typeof(UnityEngine.SerializeField), false).Length > 0)
-                )
+                .Where(t => t.FieldType.IsSubclassOf(typeof(ParameterOverride)) && t.Name != "enabled" && ((t.IsPublic && t.GetCustomAttributes(typeof(NonSerializedAttribute), false).Length == 0)
+                    || (t.GetCustomAttributes(typeof(UnityEngine.SerializeField), false).Length > 0))
+                    )
                 .ToList();
 
             foreach (var field in fields)

PostProcessing/Editor/Effects/LensDistortionEditor.cs

@@ -7,7 +7,7 @@ internal sealed class LensDistortionEditor : DefaultPostProcessEffectEditor
     {
         public override void OnInspectorGUI()
         {
-            if (RuntimeUtilities.isVREnabled)
+            if (EditorUtilities.isVREnabled)
                 EditorGUILayout.HelpBox("Lens Distortion is available only for non-stereo cameras.", MessageType.Warning);
 
             base.OnInspectorGUI();

PostProcessing/Editor/Effects/MotionBlurEditor.cs

@@ -7,7 +7,7 @@ internal sealed class MotionBlurEditor : DefaultPostProcessEffectEditor
     {
         public override void OnInspectorGUI()
         {
-            if (RuntimeUtilities.isVREnabled)
+            if (EditorUtilities.isVREnabled)
                 EditorGUILayout.HelpBox("Motion Blur is available only for non-stereo cameras.", MessageType.Warning);
 
             base.OnInspectorGUI();

PostProcessing/Editor/PostProcessLayerEditor.cs

@@ -166,7 +166,7 @@ void DoAntialiasing()
                         EditorGUILayout.HelpBox("TAA requires Unity 2017.3+ for Single-pass stereo rendering support.", MessageType.Warning);
                     #endif
                     #if UNITY_2017_3_OR_NEWER
-                    if (m_TargetCameraComponent != null && m_TargetCameraComponent.allowDynamicResolution)
+                    if (m_TargetCameraComponent != null && RuntimeUtilities.IsDynamicResolutionEnabled(m_TargetCameraComponent))
                         EditorGUILayout.HelpBox("TAA is not supported with Dynamic Resolution.", MessageType.Warning);
                     #endif
 

PostProcessing/Editor/Tools/DefineSetter.cs

@@ -1,13 +1,16 @@
 using System;
 using System.Linq;
+#if UNITY_2021_3_OR_NEWER
+using UnityEditor.Build;
+#endif
 
 namespace UnityEditor.Rendering.PostProcessing
 {
     [InitializeOnLoad]
     sealed class DefineSetter
     {
         const string k_Define = "UNITY_POST_PROCESSING_STACK_V2";
-        
+
         static DefineSetter()
         {
             var targets = Enum.GetValues(typeof(BuildTargetGroup))
@@ -17,7 +20,12 @@ static DefineSetter()
 
             foreach (var target in targets)
             {
+#if UNITY_2021_3_OR_NEWER
+                var namedTarget = NamedBuildTarget.FromBuildTargetGroup(target);
+                var defines = PlayerSettings.GetScriptingDefineSymbols(namedTarget).Trim();
+#else
                 var defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(target).Trim();
+#endif
 
                 var list = defines.Split(';', ' ')
                     .Where(x => !string.IsNullOrEmpty(x))
@@ -29,7 +37,11 @@ static DefineSetter()
                 list.Add(k_Define);
                 defines = list.Aggregate((a, b) => a + ";" + b);
 
+#if UNITY_2021_3_OR_NEWER
+                PlayerSettings.SetScriptingDefineSymbols(namedTarget, defines);
+#else
                 PlayerSettings.SetScriptingDefineSymbolsForGroup(target, defines);
+#endif
             }
         }
 
@@ -42,4 +54,4 @@ static bool IsObsolete(BuildTargetGroup group)
             return attrs != null && attrs.Length > 0;
         }
     }
-}
+}

PostProcessing/Editor/Unity.Postprocessing.Editor.asmdef

@@ -1,9 +1,11 @@
 {
     "name": "Unity.Postprocessing.Editor",
+    "rootNamespace": "",
     "references": [
-        "Unity.Postprocessing.Runtime"
+        "Unity.Postprocessing.Runtime",
+        "Unity.XR.Management",
+        "Unity.XR.Management.Editor"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -12,5 +14,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

PostProcessing/Editor/Utils/EditorUtilities.cs

@@ -5,6 +5,10 @@
 using UnityEngine.Assertions;
 using UnityEngine.Rendering.PostProcessing;
 
+#if XR_MANAGEMENT_4_0_1_OR_NEWER
+using UnityEditor.XR.Management;
+#endif
+
 namespace UnityEditor.Rendering.PostProcessing
 {
     /// <summary>
@@ -26,7 +30,14 @@ public static bool isTargetingConsoles
             {
                 var t = EditorUserBuildSettings.activeBuildTarget;
                 return t == BuildTarget.PS4
+#if UNITY_PS5
+                    || t == BuildTarget.PS5
+#endif
                     || t == BuildTarget.XboxOne
+#if UNITY_GAMECORE
+                    || t == BuildTarget.GameCoreXboxSeries
+                    || t == BuildTarget.GameCoreXboxOne
+#endif
                     || t == BuildTarget.Switch;
             }
         }
@@ -53,6 +64,30 @@ public static bool isTargetingMobiles
             }
         }
 
+        /// <summary>
+        /// Returns <c>true</c> if the current target is Android, <c>false</c> otherwise.
+        /// </summary>
+        public static bool isTargetingAndroid
+        {
+            get
+            {
+                var t = EditorUserBuildSettings.activeBuildTarget;
+                return t == BuildTarget.Android;
+            }
+        }
+
+        /// <summary>
+        /// Returns <c>true</c> if the current target is WebGL, <c>false</c> otherwise.
+        /// </summary>
+        public static bool isTargetingWebGL
+        {
+            get
+            {
+                var t = EditorUserBuildSettings.activeBuildTarget;
+                return t == BuildTarget.WebGL;
+            }
+        }
+
         /// <summary>
         /// Returns <c>true</c> if the current target is a console or a mobile, <c>false</c>
         /// otherwise.
@@ -78,14 +113,23 @@ static void OnEditorReload()
         static void ReloadDecoratorTypes()
         {
             s_AttributeDecorators.Clear();
-
+            /*
             // Look for all the valid attribute decorators
             var types = RuntimeUtilities.GetAllTypesDerivedFrom<AttributeDecorator>()
                             .Where(
                                 t => t.IsDefined(typeof(DecoratorAttribute), false)
                                   && !t.IsAbstract
                             );
-
+            */
+            Type[] types = new[]
+            {
+                typeof(UnityEditor.Rendering.PostProcessing.RangeDecorator),
+                typeof(UnityEditor.Rendering.PostProcessing.MinDecorator),
+                typeof(UnityEditor.Rendering.PostProcessing.MaxDecorator),
+                typeof(UnityEditor.Rendering.PostProcessing.MinMaxDecorator),
+                typeof(UnityEditor.Rendering.PostProcessing.ColorUsageDecorator),
+                typeof(UnityEditor.Rendering.PostProcessing.TrackballDecorator),
+            };
             // Store them
             foreach (var type in types)
             {
@@ -353,5 +397,28 @@ static bool CanPaste(PostProcessEffectSettings target)
             return s_ClipboardContent != null
                 && s_ClipboardContent.GetType() == target.GetType();
         }
+
+        internal static bool isVREnabled
+        {
+            get
+            {
+#if ENABLE_VR_MODULE && ENABLE_VR
+#if ENABLE_XR_MODULE && XR_MANAGEMENT_4_0_1_OR_NEWER
+                // If XR manager extension is available, we can query it to know if any XR extension is currently active
+                var buildTargetSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(BuildTargetGroup.Standalone);
+                return (buildTargetSettings != null && buildTargetSettings.AssignedSettings != null &&
+                        buildTargetSettings.AssignedSettings.activeLoaders.Count > 0);
+#elif !UNITY_2020_1_OR_NEWER
+                // This will only work with 2019.3 and older since it rely on the old VR module
+                return UnityEditorInternal.VR.VREditor.GetVREnabledOnTargetGroup(BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget));
+#else
+                // If we reach this code-path, it means we can't really detect if VR/XR is active in the Editor, so return false
+                return false;
+#endif
+#else
+                return false;
+#endif
+            }
+        }
     }
 }