diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index be1276f3ad9..032873d1319 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -386,6 +386,7 @@ The version number for this package has increased due to a version update of a r - Fixed impossibility to release the cursor in the template. - Fixed assert failure when enabling the probe volume system for the first time. - Significantly improved performance of APV probe debug. +- 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 6835576ef2a..1c93bbf4452 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.RemoveDLSSKeywords(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..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 @@ -23,12 +23,15 @@ class QualitySettingsPanel [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { + var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() + .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()); + + keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(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..4f3ee51e1cd --- /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 RemoveDLSSKeywords(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: