From a7168614c08ac2c0ad441d1173bf6a93a2c65fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vauchelles?= Date: Mon, 20 Apr 2020 14:19:44 +0200 Subject: [PATCH 1/2] Moved API from Utilities to UnityEngine.Rendering --- .../Editor/Utilities/EditorMaterialQuality.cs | 2 +- .../Runtime/Utilities/MaterialQuality.cs | 7 +++--- .../RenderPipeline/HDRenderPipelineUI.cs | 2 +- .../Settings/FrameSettingsUI.Drawers.cs | 24 +++++++++---------- .../Runtime/RenderPipeline/Camera/HDCamera.cs | 1 - .../RenderPipeline/HDRenderPipeline.cs | 1 - .../RenderPipeline/HDRenderPipelineAsset.cs | 1 - .../RenderPipeline/Settings/FrameSettings.cs | 1 - 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/Utilities/EditorMaterialQuality.cs b/com.unity.render-pipelines.core/Editor/Utilities/EditorMaterialQuality.cs index b61838e0793..f07da3c144f 100644 --- a/com.unity.render-pipelines.core/Editor/Utilities/EditorMaterialQuality.cs +++ b/com.unity.render-pipelines.core/Editor/Utilities/EditorMaterialQuality.cs @@ -1,5 +1,5 @@ using UnityEngine.Rendering; -using Utilities; + namespace UnityEditor.Rendering.Utilities { diff --git a/com.unity.render-pipelines.core/Runtime/Utilities/MaterialQuality.cs b/com.unity.render-pipelines.core/Runtime/Utilities/MaterialQuality.cs index 3975343b72c..879ac777aaf 100644 --- a/com.unity.render-pipelines.core/Runtime/Utilities/MaterialQuality.cs +++ b/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 { /// /// Material quality flags. /// [Flags] + [MovedFrom("Utilities")] public enum MaterialQuality { /// Low Material Quality. @@ -21,6 +21,7 @@ public enum MaterialQuality /// /// Material Quality utility class. /// + [MovedFrom("Utilities")] public static class MaterialQualityUtilities { /// diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs index bd41dd2e4e1..f4b88e77283 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs +++ b/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; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs index 3a5972baca5..db229dd7a35 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs +++ b/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() ); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs index f935ef4e77a..db0a5cec65e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs +++ b/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; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 44f1897e6cf..df9e15c5e9d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/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 { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index d40e6bbfb3d..de83731a0eb 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/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 { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs index b0757bcbf66..7dd6e07366b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs +++ b/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 { From ab289308308de5547b14e9c389f10e73b2be66a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vauchelles?= Date: Mon, 20 Apr 2020 14:23:47 +0200 Subject: [PATCH 2/2] Updated changelog --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 94a5b68247b..0464fb1db7e 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/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.