Merge pull request #8275 from Unity-Technologies/internal/6000.3/staging

Mirror Internal/6000.3/staging

Author: KEngelstoft

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs

@@ -196,7 +196,6 @@ internal void SetVolumeProfile(VolumeProfile p)
 
         static Dictionary<Type, VolumeParameterDrawer> s_ParameterDrawers;
         SupportedOnRenderPipelineAttribute m_SupportedOnRenderPipelineAttribute;
-        Type[] m_LegacyPipelineTypes;
 
         static VolumeComponentEditor()
         {
@@ -274,11 +273,6 @@ internal void Init()
 
             var volumeComponentType = volumeComponent.GetType();
             m_SupportedOnRenderPipelineAttribute = volumeComponentType.GetCustomAttribute<SupportedOnRenderPipelineAttribute>();
-
-#pragma warning disable CS0618
-            var supportedOn = volumeComponentType.GetCustomAttribute<VolumeComponentMenuForRenderPipeline>();
-            m_LegacyPipelineTypes = supportedOn != null ? supportedOn.pipelineTypes : Array.Empty<Type>();
-#pragma warning restore CS0618
         }
 
         internal void DetermineVisibility(Type renderPipelineAssetType, Type renderPipelineType)
@@ -295,12 +289,6 @@ internal void DetermineVisibility(Type renderPipelineAssetType, Type renderPipel
                 return;
             }
 
-            if (renderPipelineType != null && m_LegacyPipelineTypes.Length > 0)
-            {
-                visible = m_LegacyPipelineTypes.Contains(renderPipelineType);
-                return;
-            }
-
             visible = true;
         }
 
@@ -451,12 +439,12 @@ public virtual GUIContent GetDisplayTitle()
             var displayInfo = volumeComponentType.GetCustomAttribute<DisplayInfoAttribute>();
             if (displayInfo != null && !string.IsNullOrWhiteSpace(displayInfo.name))
                 return EditorGUIUtility.TrTextContent(displayInfo.name, string.Empty);
-            
+
             #pragma warning disable CS0618
             if (!string.IsNullOrWhiteSpace(volumeComponent.displayName))
                 return EditorGUIUtility.TrTextContent(volumeComponent.displayName, string.Empty);
             #pragma warning restore CS0618
-            
+
             return EditorGUIUtility.TrTextContent(ObjectNames.NicifyVariableName(volumeComponentType.Name) , string.Empty);
         }
 

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileUtils.cs

@@ -140,19 +140,19 @@ static VolumeComponent GetVolumeComponentOfTypeOrDefault(this VolumeProfile prof
         static List<Type> GetTypesMissingFromDefaultProfile(VolumeProfile profile)
         {
             List<Type> missingTypes = new List<Type>();
-            var volumeComponentTypes = VolumeManager.instance.baseComponentTypeArray;
+
+            var volumeComponentTypes = VolumeManager.instance.isInitialized ?
+                VolumeManager.instance.baseComponentTypeArray : VolumeManager.instance.LoadBaseTypesByReflection(GraphicsSettings.currentRenderPipelineAssetType);
             foreach (var type in volumeComponentTypes)
             {
                 if (profile.components.Find(c => c.GetType() == type) == null)
                 {
-                    if (type.IsDefined(typeof(ObsoleteAttribute), false) ||
-                        type.IsDefined(typeof(HideInInspector), false))
+                    if (type.IsDefined(typeof(ObsoleteAttribute), false))
                         continue;
 
                     missingTypes.Add(type);
                 }
             }
-
             return missingTypes;
         }
 
@@ -163,13 +163,14 @@ static List<Type> GetTypesMissingFromDefaultProfile(VolumeProfile profile)
         /// <param name="profile">VolumeProfile to use.</param>
         /// <param name="defaultValueSource">An optional VolumeProfile asset containing default values to use for
         /// any components that are added to <see cref="profile"/>.</param>
-        public static void EnsureAllOverridesForDefaultProfile(VolumeProfile profile, VolumeProfile defaultValueSource = null)
+        public static void EnsureAllOverridesForDefaultProfile(VolumeProfile profile, VolumeProfile defaultValueSource = null) => TryEnsureAllOverridesForDefaultProfile(profile, defaultValueSource);
+        internal static bool TryEnsureAllOverridesForDefaultProfile(VolumeProfile profile, VolumeProfile defaultValueSource = null)
         {
             // It's possible that the volume profile is assigned to the default asset inside the HDRP package. In
             // this case it cannot be modified. User is expected to use HDRP Wizard "Fix" to create a local profile.
             var path = AssetDatabase.GetAssetPath(profile);
             if (CoreEditorUtils.IsAssetInReadOnlyPackage(path))
-                return;
+                return false;
 
             bool changed = false;
             int numComponentsBefore = profile.components.Count;
@@ -241,6 +242,8 @@ public static void EnsureAllOverridesForDefaultProfile(VolumeProfile profile, Vo
                 VolumeManager.instance.OnVolumeProfileChanged(profile);
                 EditorUtility.SetDirty(profile);
             }
+
+            return changed;
         }
 
         /// <summary>

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs

@@ -97,7 +97,7 @@ internal enum TextureUVOriginSelection
     /// </summary>
     [DebuggerDisplay("Texture ({handle.index})")]
     [MovedFrom(true, "UnityEngine.Experimental.Rendering.RenderGraphModule", "UnityEngine.Rendering.RenderGraphModule")]
-    public readonly struct TextureHandle
+    public readonly struct TextureHandle : IEquatable<TextureHandle>
     {
         private static TextureHandle s_NullHandle = new TextureHandle();
 
@@ -151,6 +151,52 @@ internal TextureHandle(int handle, bool shared = false, bool builtin = false)
         /// <returns>Resource as a RTHandle.</returns>
         public static implicit operator RTHandle(TextureHandle texture) => texture.IsValid() ? RenderGraphResourceRegistry.current.GetTexture(texture) : null;
 
+        /// <summary>
+        /// Determines whether this instance and another specified <see cref="TextureHandle"/> object have the same underlying resource handle.
+        /// </summary>
+        /// <param name="other">The texture handle to compare with the current instance.</param>
+        /// <returns>
+        /// True if both texture handles reference the same underlying resource; otherwise, false.
+        /// </returns>
+        public bool Equals(TextureHandle other) => handle.Equals(other.handle);
+
+        /// <summary>
+        /// Determines whether the specified object is equal to the current <see cref="TextureHandle"/>.
+        /// </summary>
+        /// <param name="obj">The object to compare with the current instance.</param>
+        /// <returns>
+        /// True if the specified object is a <see cref="TextureHandle"/> and references the same underlying resource; otherwise, false.
+        /// </returns>
+        public override bool Equals(object obj) => obj is TextureHandle other && Equals(other);
+
+        /// <summary>
+        /// Returns the hash code for this <see cref="TextureHandle"/>.
+        /// </summary>
+        /// <returns>
+        /// The hash code of the current <see cref="TextureHandle"/>.
+        /// </returns>
+        public override int GetHashCode() => handle.GetHashCode();
+
+        /// <summary>
+        /// Determines whether two <see cref="TextureHandle"/> instances reference the same underlying resource.
+        /// </summary>
+        /// <param name="lhs">The first texture handle to compare.</param>
+        /// <param name="rhs">The second texture handle to compare.</param>
+        /// <returns>
+        /// True if both handles reference the same underlying resource; otherwise, false.
+        /// </returns>
+        public static bool operator ==(TextureHandle lhs, TextureHandle rhs) => lhs.handle.Equals(rhs.handle);
+
+        /// <summary>
+        /// Determines whether two <see cref="TextureHandle"/> instances reference different underlying resources.
+        /// </summary>
+        /// <param name="lhs">The first texture handle to compare.</param>
+        /// <param name="rhs">The second texture handle to compare.</param>
+        /// <returns>
+        /// True if the handles reference different underlying resources; otherwise, false.
+        /// </returns>
+        public static bool operator !=(TextureHandle lhs, TextureHandle rhs) => !lhs.handle.Equals(rhs.handle);
+
         /// <summary>
         /// Return true if the handle is valid.
         /// </summary>

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs

@@ -123,6 +123,21 @@ public bool Equals(ResourceHandle hdl)
         {
             return hdl.m_Value == this.m_Value && hdl.m_Version == this.m_Version && hdl.type == this.type;
         }
+
+        public static bool operator ==(ResourceHandle lhs, ResourceHandle rhs) => lhs.Equals(rhs);
+
+        public static bool operator !=(ResourceHandle lhs, ResourceHandle rhs) => !lhs.Equals(rhs);
+
+        public override bool Equals(object obj) => obj is ResourceHandle other && Equals(other);
+
+        public override int GetHashCode()
+        {
+            var hashCode = HashFNV1A32.Create();
+            hashCode.Append(m_Value);
+            hashCode.Append(m_Version);
+            hashCode.Append(m_Type);
+            return hashCode.value;
+        }
     }
 
     class IRenderGraphResource

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

@@ -45,7 +45,7 @@ public VolumeComponentMenu(string menu)
     /// This attribute allows you to add commands to the <b>Add Override</b> popup menu on Volumes,
     /// while also specifying the render pipeline(s) for which the command will be supported.
     /// </summary>
-    [Obsolete(@"VolumeComponentMenuForRenderPipelineAttribute is deprecated. Use VolumeComponentMenu with SupportedOnRenderPipeline instead. #from(2023.1)")]
+    [Obsolete(@"VolumeComponentMenuForRenderPipelineAttribute is deprecated. Use VolumeComponentMenu with SupportedOnRenderPipeline instead. #from(2023.1)", true)]
     public class VolumeComponentMenuForRenderPipeline : VolumeComponentMenu
     {
         /// <summary>
@@ -126,7 +126,7 @@ public sealed class VolumeComponentDeprecated : Attribute
     /// <para>
     /// In the example above, the custom component `ExampleComponent` extends `VolumeComponent` and defines a parameter
     /// (`intensity`) that can be manipulated within the volume framework. The `ClampedFloatParameter` is a type of
-    /// <see cref="VolumeParameter{T}"/> that ensures the value remains within a specified range. 
+    /// <see cref="VolumeParameter{T}"/> that ensures the value remains within a specified range.
     /// </para>
     /// </example>
     [Serializable]
@@ -164,7 +164,7 @@ public Indent(int relativeAmount = 1)
         /// The backing storage of <see cref="parameters"/>. Use this for performance-critical work.
         /// </summary>
         internal VolumeParameter[] parameterList;
-        
+
         ReadOnlyCollection<VolumeParameter> m_ParameterReadOnlyCollection;
 
         /// <summary>
@@ -355,7 +355,7 @@ public bool AnyPropertiesIsOverridden()
         {
             for (int i = 0; i < parameterList.Length; ++i)
             {
-                if (parameterList[i].overrideState) 
+                if (parameterList[i].overrideState)
                     return true;
             }
             return false;