Removed DLSS keyword from settings' search (case 1358409)

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

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<HDGlobalSettingsPanelIMGUI.Styles>()
+                .Concat(OverridableFrameSettingsArea.frameSettingsKeywords);
+
+            keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(keywords);
+
             return new SettingsProvider("Project/Graphics/HDRP Global Settings", SettingsScope.Project)
             {
                 activateHandler = s_IMGUIImpl.OnActivate,
-                keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties<HDGlobalSettingsPanelIMGUI.Styles>()
-                    .Concat(OverridableFrameSettingsArea.frameSettingsKeywords)
-                    .ToArray(),
+                keywords = keywords.ToArray(),
                 guiHandler = s_IMGUIImpl.DoGUI,
                 titleBarGuiHandler = s_IMGUIImpl.OnTitleBarGUI
             };

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<QualitySettingsPanelIMGUI.Styles>()
+                .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<HDRenderPipelineUI.Styles>());
+
+            keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(keywords);
+
             return new SettingsProvider("Project/Quality/HDRP", SettingsScope.Project)
             {
                 activateHandler = s_IMGUIImpl.OnActivate,
-                keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties<QualitySettingsPanelIMGUI.Styles>()
-                    .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<HDRenderPipelineUI.Styles>())
-                    .ToArray(),
+                keywords = keywords.ToArray(),
                 guiHandler = s_IMGUIImpl.OnGUI,
             };
         }

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<string> RemoveDLSSKeywords(IEnumerable<string> 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
+        }
+    }
+}