Backport 8.x.x - 1204667 - Moved Utilities namespace

com.unity.render-pipelines.core/Editor/Utilities/EditorMaterialQuality.cs

@@ -1,5 +1,5 @@
 using UnityEngine.Rendering;
-using Utilities;
+
 
 namespace UnityEditor.Rendering.Utilities
 {

com.unity.render-pipelines.core/Runtime/Utilities/MaterialQuality.cs

@@ -1,13 +1,13 @@
 using System;
-using UnityEngine;
-using UnityEngine.Rendering;
+using UnityEngine.Scripting.APIUpdating;
 
-namespace Utilities
+namespace UnityEngine.Rendering
 {
     /// <summary>
     /// Material quality flags.
     /// </summary>
     [Flags]
+    [MovedFrom("Utilities")]
     public enum MaterialQuality
     {
         /// <summary>Low Material Quality.</summary>
@@ -21,6 +21,7 @@ public enum MaterialQuality
     /// <summary>
     /// Material Quality utility class.
     /// </summary>
+    [MovedFrom("Utilities")]
     public static class MaterialQualityUtilities
     {
         /// <summary>

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -59,6 +59,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed warning about missing bound decal buffer
 - Fixed the debug exposure mode for display sky reflection and debug view baked lighting
 - Fixed shader warning on Xbox for ResolveStencilBuffer.compute. 
+- Renamed namespace Utilities to UnityEngine.Rendering (case 1204667)
 
 ### Changed
 - Rejecting history for ray traced reflections based on a threshold evaluated on the neighborhood of the sampled history.

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs

@@ -2,7 +2,7 @@
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.HighDefinition;
 using System.Text;
-using Utilities;
+
 using UnityEngine.Experimental.Rendering;
 using static UnityEngine.Rendering.HighDefinition.RenderPipelineSettings;
 

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.Rendering.HighDefinition;
 using UnityEditor.Rendering;
-using Utilities;
+
 
 namespace UnityEditor.Rendering.HighDefinition
 {
@@ -19,27 +19,27 @@ enum MaterialQualityMode
 
     static class MaterialQualityModeExtensions
     {
-        public static MaterialQuality Into(this MaterialQualityMode quality)
+        public static UnityEngine.Rendering.MaterialQuality Into(this MaterialQualityMode quality)
         {
             switch (quality)
             {
-                case MaterialQualityMode.High: return MaterialQuality.High;
-                case MaterialQualityMode.Medium: return MaterialQuality.Medium;
-                case MaterialQualityMode.Low: return MaterialQuality.Low;
-                case MaterialQualityMode.FromQualitySettings: return (MaterialQuality)0;
+                case MaterialQualityMode.High: return UnityEngine.Rendering.MaterialQuality.High;
+                case MaterialQualityMode.Medium: return UnityEngine.Rendering.MaterialQuality.Medium;
+                case MaterialQualityMode.Low: return UnityEngine.Rendering.MaterialQuality.Low;
+                case MaterialQualityMode.FromQualitySettings: return (UnityEngine.Rendering.MaterialQuality)0;
                 default: throw new ArgumentOutOfRangeException(nameof(quality));
             }
         }
 
-        public static MaterialQualityMode Into(this MaterialQuality quality)
+        public static MaterialQualityMode Into(this UnityEngine.Rendering.MaterialQuality quality)
         {
-            if (quality == (MaterialQuality) 0)
+            if (quality == (UnityEngine.Rendering.MaterialQuality) 0)
                 return MaterialQualityMode.FromQualitySettings;
             switch (quality)
             {
-                case MaterialQuality.High: return MaterialQualityMode.High;
-                case MaterialQuality.Medium: return MaterialQualityMode.Medium;
-                case MaterialQuality.Low: return MaterialQualityMode.Low;
+                case UnityEngine.Rendering.MaterialQuality.High: return MaterialQualityMode.High;
+                case UnityEngine.Rendering.MaterialQuality.Medium: return MaterialQualityMode.Medium;
+                case UnityEngine.Rendering.MaterialQuality.Low: return MaterialQualityMode.Low;
                 default: throw new ArgumentOutOfRangeException(nameof(quality));
             }
         }
@@ -254,7 +254,7 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized,
 
             area.AmmendInfo(FrameSettingsField.MaterialQualityLevel,
                 overridedDefaultValue: defaultFrameSettings.materialQuality.Into(),
-                customGetter: () => ((MaterialQuality)serialized.materialQuality.intValue).Into(),
+                customGetter: () => ((UnityEngine.Rendering.MaterialQuality)serialized.materialQuality.intValue).Into(),
                 customSetter: v => serialized.materialQuality.intValue = (int)((MaterialQualityMode)v).Into()
             );
 

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Utilities;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.Experimental.Rendering.RenderGraphModule;
 

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs

@@ -6,7 +6,6 @@
 using UnityEngine.Experimental.GlobalIllumination;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.Experimental.Rendering.RenderGraphModule;
-using Utilities;
 
 namespace UnityEngine.Rendering.HighDefinition
 {

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine.Serialization;
-using Utilities;
 
 namespace UnityEngine.Rendering.HighDefinition
 {

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs

@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Linq;
-using Utilities;
 
 namespace UnityEngine.Rendering.HighDefinition
 {