From 3028fc88e877d2fc2275175fe54a85a99c642e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vauchelles?= Date: Tue, 17 Aug 2021 10:28:53 +0200 Subject: [PATCH 1/3] Removed DLSS keyword from settings' search (case 1358409) --- .../CHANGELOG.md | 1 + .../Settings/HDGlobalSettingsWindow.cs | 9 ++++++--- .../Settings/QualitySettingsPanel.cs | 9 ++++++--- .../RenderPipelineSettingsUtilities.cs | 19 +++++++++++++++++++ .../RenderPipelineSettingsUtilities.cs.meta | 11 +++++++++++ 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index d7d0f4fd46f..a9cb4aa730c 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -368,6 +368,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed the fallback sun for volumetric clouds having a non null intensity (case 1353955). - Removed unsupported fields from Presets of Light, Camera, and Reflection Probes (case 1335979). - Added a new property to control the ghosting reduction for volumetric clouds (case 1357702). +- Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs index ece833a26b1..0cb680647bb 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs @@ -21,12 +21,15 @@ class HDGlobalSettingsPanelProvider [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { + var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() + .Concat(OverridableFrameSettingsArea.frameSettingsKeywords); + + keywords = RenderPipelineSettingsUtilities.Case1358409Workaround(keywords); + return new SettingsProvider("Project/Graphics/HDRP Global Settings", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, - keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() - .Concat(OverridableFrameSettingsArea.frameSettingsKeywords) - .ToArray(), + keywords = keywords.ToArray(), guiHandler = s_IMGUIImpl.DoGUI, titleBarGuiHandler = s_IMGUIImpl.OnTitleBarGUI }; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs index cd0825e358c..368c12f268a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs @@ -23,12 +23,15 @@ class QualitySettingsPanel [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { + var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() + .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()); + + keywords = RenderPipelineSettingsUtilities.Case1358409Workaround(keywords); + return new SettingsProvider("Project/Quality/HDRP", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, - keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() - .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()) - .ToArray(), + keywords = keywords.ToArray(), guiHandler = s_IMGUIImpl.OnGUI, }; } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs new file mode 100644 index 00000000000..5780c3735c9 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using System.Linq; + +namespace UnityEditor.Rendering.HighDefinition +{ + static class RenderPipelineSettingsUtilities + { + public static IEnumerable Case1358409Workaround(IEnumerable keywords) + { +#if ENABLE_NVIDIA && !ENABLE_NVIDIA_MODULE + // Case 1358409 workaround: + // Remove all DLSS keyword when the NVIDIA package is not installed. + return keywords.Where(keyword => keyword.ToLower().IndexOf("dlss") == -1); +#else + return keywords; +#endif + } + } +} diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta new file mode 100644 index 00000000000..a2101600b25 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90142127598a3854d825d96865206593 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 9e3ca106fc50608ec159aa8eca04aa0e6976a246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vauchelles?= Date: Tue, 24 Aug 2021 14:13:28 +0200 Subject: [PATCH 2/3] Changed naming --- .../Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs | 2 +- .../Editor/RenderPipeline/Settings/QualitySettingsPanel.cs | 2 +- .../RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs index 0cb680647bb..6168724a158 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs @@ -24,7 +24,7 @@ public static SettingsProvider CreateSettingsProvider() var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() .Concat(OverridableFrameSettingsArea.frameSettingsKeywords); - keywords = RenderPipelineSettingsUtilities.Case1358409Workaround(keywords); + keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(keywords); return new SettingsProvider("Project/Graphics/HDRP Global Settings", SettingsScope.Project) { diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs index 368c12f268a..86a6a9f7b88 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs @@ -26,7 +26,7 @@ public static SettingsProvider CreateSettingsProvider() var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()); - keywords = RenderPipelineSettingsUtilities.Case1358409Workaround(keywords); + keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(keywords); return new SettingsProvider("Project/Quality/HDRP", SettingsScope.Project) { diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs index 5780c3735c9..4f3ee51e1cd 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs @@ -5,7 +5,7 @@ namespace UnityEditor.Rendering.HighDefinition { static class RenderPipelineSettingsUtilities { - public static IEnumerable Case1358409Workaround(IEnumerable keywords) + public static IEnumerable RemoveDLSSKeywords(IEnumerable keywords) { #if ENABLE_NVIDIA && !ENABLE_NVIDIA_MODULE // Case 1358409 workaround: From f8a2ede6db3be7f2b1f96a8a0963e52558ab819d Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Wed, 1 Sep 2021 12:55:37 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 9a42448e0a0..dec93a7a061 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -370,11 +370,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed the fallback sun for volumetric clouds having a non null intensity (case 1353955). - Removed unsupported fields from Presets of Light, Camera, and Reflection Probes (case 1335979). - Added a new property to control the ghosting reduction for volumetric clouds (case 1357702). -- Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) - Fixed the earth curvature not being properly taken into account when evaluating the sun attenuation (case 1357927). - Reduced the volumetric clouds pattern repetition frequency (case 1358717). - Fixed the clouds missing in the ambient probe and in the static and dynamic sky. - Fixed lens flare not rendering correctly with TAAU or DLSS +- Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard