[Port] [6000.5] Fixed Default Volume profile bugs

Author: svc-reach-platform-support

Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeComponent.cs

@@ -328,25 +328,6 @@ internal void SetOverridesTo(IEnumerable<VolumeParameter> enumerable, bool state
             }
         }
 
-        /// <summary>
-        /// A custom hashing function that Unity uses to compare the state of parameters.
-        /// </summary>
-        /// <returns>A computed hash code for the current instance.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                //return parameters.Aggregate(17, (i, p) => i * 23 + p.GetHash());
-
-                int hash = 17;
-
-                for (int i = 0; i < parameterList.Length; i++)
-                    hash = hash * 23 + parameterList[i].GetHashCode();
-
-                return hash;
-            }
-        }
-
         /// <summary>
         /// Returns true if any of the volume properites has been overridden.
         /// </summary>

Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeManager.cs

@@ -272,16 +272,14 @@ public void Initialize(VolumeProfile globalDefaultVolumeProfile = null, VolumePr
         void InitializeBaseTypesArray(VolumeProfile globalDefaultVolumeProfile = null)
         {
             using var profilerScope = k_ProfilerMarkerInitializeBaseTypesArray.Auto();
-#if UNITY_EDITOR
-            LoadBaseTypesByReflection(GraphicsSettings.currentRenderPipelineAssetType);
-#else
+#if !UNITY_EDITOR
             if (globalDefaultVolumeProfile == null)
             {
                 var defaultVolumeProfileSettings = GraphicsSettings.GetRenderPipelineSettings<IDefaultVolumeProfileAsset>();
                 globalDefaultVolumeProfile = defaultVolumeProfileSettings?.defaultVolumeProfile;
             }
-            LoadBaseTypes(globalDefaultVolumeProfile);
 #endif
+            LoadBaseTypes(GraphicsSettings.currentRenderPipelineAssetType, globalDefaultVolumeProfile);
         }
 
         //This is called by test where the basetypes are tuned for the purpose of the test.
@@ -323,7 +321,7 @@ public void Deinitialize()
         /// <param name="profile">The VolumeProfile to use as the global default profile.</param>
         public void SetGlobalDefaultProfile(VolumeProfile profile)
         {
-            LoadBaseTypes(profile);
+            LoadBaseTypes(GraphicsSettings.currentRenderPipelineAssetType, profile);
             globalDefaultProfile = profile;
             EvaluateVolumeDefaultState();
         }
@@ -435,8 +433,9 @@ public void DestroyStack(VolumeStack stack)
         /// LoadBaseTypes is responsible for loading the list of VolumeComponent types that will be used to build the default state of the VolumeStack. It uses the provided global default profile to determine which component types are relevant for the current render pipeline.
         /// This will be called only once at runtime on app boot
         /// </summary>
+        /// <param name="rpType">The Pipeline Type used to check if each VolumeComponent is supported.</param>
         /// <param name="globalDefaultVolumeProfile">The global default volume profile to use to build the base component type array.</param>
-        internal void LoadBaseTypes(VolumeProfile globalDefaultVolumeProfile)
+        internal void LoadBaseTypesByDefaultVolume(Type rpType, VolumeProfile globalDefaultVolumeProfile)
         {
             if (globalDefaultVolumeProfile == null)
             {
@@ -446,13 +445,13 @@ internal void LoadBaseTypes(VolumeProfile globalDefaultVolumeProfile)
 
             using (ListPool<Type>.Get(out var list))
             {
-                var pipelineAssetType = GraphicsSettings.currentRenderPipelineAssetType;
                 foreach (var comp in globalDefaultVolumeProfile.components)
                 {
-                    if (comp == null) continue;
+                    if (comp == null)
+                        continue;
 
                     var componentType = comp.GetType();
-                    if (!SupportedOnRenderPipelineAttribute.IsTypeSupportedOnRenderPipeline(componentType, pipelineAssetType))
+                    if (!SupportedOnRenderPipelineAttribute.IsTypeSupportedOnRenderPipeline(componentType, rpType))
                         continue;
 
                     list.Add(componentType);
@@ -481,15 +480,30 @@ internal Type[] LoadBaseTypesByReflection(Type pipelineAssetType)
                     if (!SupportedOnRenderPipelineAttribute.IsTypeSupportedOnRenderPipeline(t, pipelineAssetType))
                         continue;
 
+                    if (t.GetCustomAttribute<ObsoleteAttribute>() != null)
+                        continue;
+
                     list.Add(t);
                 }
-
                 m_BaseComponentTypeArray = list.ToArray();
             }
 
             return m_BaseComponentTypeArray;
         }
 #endif
+        /// <summary>
+        /// Helper to choose a type loading depending if we are in Editor and Standalone.
+        /// </summary>
+        /// <param name="pipelineAssetType">The Pipeline Type used to check if each VolumeComponent is supported.</param>
+        /// <param name="globalDefaultVolumeProfile">The global default volume profile to use to build the base component type array.</param>
+        void LoadBaseTypes(Type pipelineAssetType, VolumeProfile globalDefaultVolumeProfile = null)
+        {
+#if UNITY_EDITOR
+            LoadBaseTypesByReflection(pipelineAssetType);
+#else
+            LoadBaseTypesByDefaultVolume(pipelineAssetType, globalDefaultVolumeProfile);
+#endif
+        }
 
         internal void InitializeVolumeComponents()
         {

Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeProfile.cs

@@ -321,33 +321,16 @@ public bool TryGetAllSubclassOf<T>(Type type, List<T> result)
             return count != result.Count;
         }
 
-        /// <summary>
-        /// A custom hashing function that Unity uses to compare the state of parameters.
-        /// </summary>
-        /// <returns>A computed hash code for the current instance.</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-
-                for (int i = 0; i < components.Count; i++)
-                    hash = hash * 23 + components[i].GetHashCode();
-
-                return hash;
-            }
-        }
-
         internal int GetComponentListHashCode()
         {
             unchecked
             {
-                int hash = 17;
+                var hashCode = HashFNV1A32.Create();
 
                 for (int i = 0; i < components.Count; i++)
-                    hash = hash * 23 + components[i].GetType().GetHashCode();
+                    hashCode.Append(components[i].GetType().GetHashCode());
 
-                return hash;
+                return hashCode.value;
             }
         }
 

Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentDecorators.cs

@@ -0,0 +1,18 @@
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace UnityEditor.Rendering.Tests
+{
+    [HideInInspector]
+    class VolumeComponentDecorators : VolumeComponent
+    {
+        [Tooltip("Increase to make the noise texture appear bigger and less")]
+        public FloatParameter _NoiseTileSize = new FloatParameter(25.0f);
+
+        [InspectorName("Color")]
+        public ColorParameter _FogColor = new ColorParameter(Color.grey);
+
+        [InspectorName("Size and occurrence"), Tooltip("Increase to make patches SMALLER, and frequent")]
+        public ClampedFloatParameter _HighNoiseSpaceFreq = new ClampedFloatParameter(0.1f, 0.1f, 1f);
+    }
+}

Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentDecorators.cs.meta

@@ -310,19 +310,6 @@ public string[] AdditionalProperties(Type volumeComponentType)
 
         #region Decorators Handling Test
 
-        [HideInInspector]
-        class VolumeComponentDecorators : VolumeComponent
-        {
-            [Tooltip("Increase to make the noise texture appear bigger and less")]
-            public FloatParameter _NoiseTileSize = new FloatParameter(25.0f);
-
-            [InspectorName("Color")]
-            public ColorParameter _FogColor = new ColorParameter(Color.grey);
-
-            [InspectorName("Size and occurrence"), Tooltip("Increase to make patches SMALLER, and frequent")]
-            public ClampedFloatParameter _HighNoiseSpaceFreq = new ClampedFloatParameter(0.1f, 0.1f, 1f);
-        }
-
         readonly (string displayName, string tooltip)[] k_ExpectedResults =
         {
             (string.Empty, "Increase to make the noise texture appear bigger and less"),