Clean SRP Smoke tests

- Remove the VR and XR modules, and therefore defines, from the SRP smoke tests. This allows catching compilation errors faster, in the `PR` pipelines instead of in the QV (so far only the (QV) OnDemandImport project was testing the path where these 2 modules are not used). More context in that [thread](https://unity.slack.com/archives/C20E70CAC/p1702559984581049?thread_ts=1702552104.332429&cid=C20E70CAC).
- This change prompted me to remove all other non SRP related packages/modules from the manifest. The goal with SRP Smoke tests is really just to make sure all packages compile, and having too much bloat even potentially hides unnecessary dependencies as this is not what an end user would have locally. The 2 graphics tests were removed as they needed the graphics test framework package, which depended on the VR and XR modules.

- Add the SRP smoke tests project to `PR URP`.

Author: theo-at-unity

Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs

@@ -512,6 +512,17 @@ internal static ShaderFeatures GetSupportedShaderFeaturesFromRenderers(
             return combinedURPAssetShaderFeatures;
         }
 
+        internal static bool NeedsProceduralKeyword(ref RendererRequirements rendererRequirements)
+        {
+            #if ENABLE_VR && ENABLE_XR_MODULE
+                var xrResourcesAreValid = GraphicsSettings.GetRenderPipelineSettings<UniversalRenderPipelineRuntimeXRResources>()?.valid ?? false;
+                return rendererRequirements.isUniversalRenderer && xrResourcesAreValid;
+            #else
+                return false;
+            #endif
+        }
+
+
         internal static RendererRequirements GetRendererRequirements(ref UniversalRenderPipelineAsset urpAsset, ref ScriptableRenderer renderer, ref ScriptableRendererData rendererData, bool stripUnusedVariants)
         {
             UniversalRenderer universalRenderer = renderer as UniversalRenderer;
@@ -533,13 +544,7 @@ internal static RendererRequirements GetRendererRequirements(ref UniversalRender
             rsd.needsRenderPass                   = (rsd.isUniversalRenderer && rsd.renderingMode == RenderingMode.Deferred);
             rsd.needsReflectionProbeBlending      = urpAsset.reflectionProbeBlending;
             rsd.needsReflectionProbeBoxProjection = urpAsset.reflectionProbeBoxProjection;
-
-            #if ENABLE_VR && ENABLE_XR_MODULE
-            var xrResourcesAreValid = GraphicsSettings.GetRenderPipelineSettings<UniversalRenderPipelineRuntimeXRResources>()?.valid ?? false;
-            rsd.needsProcedural                   = rsd.isUniversalRenderer && xrResourcesAreValid;
-            #else
-            rsd.needsProcedural                   = false;
-            #endif
+            rsd.needsProcedural                   = NeedsProceduralKeyword(ref rsd);
             rsd.needsSHVertexForSHAuto            = s_UseSHPerVertexForSHAuto;
 
             return rsd;

Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderBuildPreprocessorTests.cs

@@ -37,12 +37,12 @@ internal ShaderFeatures defaultURPAssetFeatures
                               ShaderFeatures.MainLight
                             | ShaderFeatures.MixedLighting
                             | ShaderFeatures.TerrainHoles
-                            | ShaderFeatures.DrawProcedural
                             | ShaderFeatures.LightCookies
                             | ShaderFeatures.LODCrossFade
                             | ShaderFeatures.AutoSHMode
                             | ShaderFeatures.DataDrivenLensFlare
-                            | ShaderFeatures.ScreenSpaceLensFlare;
+                            | ShaderFeatures.ScreenSpaceLensFlare
+                            | GetCorrectProceduralKeyword(ref defaultRendererRequirements);
 
                     if (PlayerSettings.allowHDRDisplaySupport)
                         defaultFeatures |= ShaderFeatures.HdrGrading;
@@ -51,23 +51,14 @@ internal ShaderFeatures defaultURPAssetFeatures
                 }
             }
 
-            internal RendererRequirements defaultRendererRequirements = new()
+            internal bool NeedsProceduralKeyword(ref RendererRequirements rendererRequirements) => ShaderBuildPreprocessor.NeedsProceduralKeyword(ref rendererRequirements);
+
+            internal ShaderFeatures GetCorrectProceduralKeyword(ref RendererRequirements rendererRequirements)
             {
-                msaaSampleCount = 1,
-                needsUnusedVariants = false,
-                isUniversalRenderer = true,
-                needsProcedural = true,
-                needsAdditionalLightShadows = false,
-                needsSoftShadows = false,
-                needsShadowsOff = false,
-                needsAdditionalLightsOff = false,
-                needsGBufferRenderingLayers = false,
-                needsGBufferAccurateNormals = false,
-                needsRenderPass = false,
-                needsReflectionProbeBlending = false,
-                needsReflectionProbeBoxProjection = false,
-                renderingMode = RenderingMode.Forward,
-            };
+                return NeedsProceduralKeyword(ref rendererRequirements) ? ShaderFeatures.DrawProcedural : ShaderFeatures.None;
+            }
+
+            internal RendererRequirements defaultRendererRequirements = new();
 
             public TestHelper()
             {
@@ -160,6 +151,22 @@ internal void AssertRendererRequirementsAndReset(RendererRequirements expected,
 
             internal void ResetData()
             {
+                defaultRendererRequirements = new();
+                defaultRendererRequirements.msaaSampleCount = 1;
+                defaultRendererRequirements.needsUnusedVariants = false;
+                defaultRendererRequirements.isUniversalRenderer = true;
+                defaultRendererRequirements.needsAdditionalLightShadows = false;
+                defaultRendererRequirements.needsSoftShadows = false;
+                defaultRendererRequirements.needsShadowsOff = false;
+                defaultRendererRequirements.needsAdditionalLightsOff = false;
+                defaultRendererRequirements.needsGBufferRenderingLayers = false;
+                defaultRendererRequirements.needsGBufferAccurateNormals = false;
+                defaultRendererRequirements.needsRenderPass = false;
+                defaultRendererRequirements.needsReflectionProbeBlending = false;
+                defaultRendererRequirements.needsReflectionProbeBoxProjection = false;
+                defaultRendererRequirements.renderingMode = RenderingMode.Forward;
+                defaultRendererRequirements.needsProcedural = NeedsProceduralKeyword(ref defaultRendererRequirements);
+
                 urpAsset.mainLightRenderingMode = LightRenderingMode.Disabled;
                 urpAsset.supportsMainLightShadows = false;
                 urpAsset.additionalLightsRenderingMode = LightRenderingMode.Disabled;
@@ -213,6 +220,7 @@ public void OneTimeSetup()
         public void Setup()
         {
             m_TestHelper = new();
+            m_TestHelper.ResetData();
         }
 
         [TearDown]
@@ -539,7 +547,7 @@ public void TestGetSupportedShaderFeaturesFromRenderer()
             // Initial state
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // Procedural...
@@ -559,126 +567,124 @@ public void TestGetSupportedShaderFeaturesFromRenderer()
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.renderingMode = RenderingMode.Forward;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.renderingMode = RenderingMode.ForwardPlus;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.ForwardPlus | ShaderFeatures.AdditionalLightsKeepOffVariants;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.ForwardPlus | ShaderFeatures.AdditionalLightsKeepOffVariants;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.renderingMode = RenderingMode.Deferred;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.DeferredShading;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.DeferredShading;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // The Off variant for Additional Lights
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsAdditionalLightsOff = false;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsAdditionalLightsOff = true;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.AdditionalLightsKeepOffVariants;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.AdditionalLightsKeepOffVariants;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // The Off variant for Main and Additional Light shadows
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsShadowsOff = false;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsShadowsOff = true;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.ShadowsKeepOffVariants;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.ShadowsKeepOffVariants;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // Soft shadows
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsSoftShadows = false;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsSoftShadows = true;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.SoftShadows;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.SoftShadows;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // Deferred GBuffer Rendering Layers
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsGBufferRenderingLayers = false;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsGBufferRenderingLayers = true;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.GBufferWriteRenderingLayers;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.GBufferWriteRenderingLayers;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // Deferred GBuffer Accurate Normals
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsGBufferAccurateNormals = false;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsGBufferAccurateNormals = true;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.AccurateGbufferNormals;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.AccurateGbufferNormals;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // Deferred GBuffer Native Render Pass
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsRenderPass = false;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsRenderPass = true;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.RenderPassEnabled;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.RenderPassEnabled;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // Reflection Probe Blending
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsReflectionProbeBlending = false;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsReflectionProbeBlending = true;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.ReflectionProbeBlending;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.ReflectionProbeBlending;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             // Reflection Probe Box Projection
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsReflectionProbeBoxProjection = false;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements);;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
 
             rendererRequirements = m_TestHelper.defaultRendererRequirements;
             rendererRequirements.needsReflectionProbeBoxProjection = true;
             actual = m_TestHelper.GetSupportedShaderFeaturesFromRenderer(rendererRequirements, ShaderFeatures.None);
-            expected = ShaderFeatures.DrawProcedural | ShaderFeatures.ReflectionProbeBoxProjection;
+            expected = m_TestHelper.GetCorrectProceduralKeyword(ref rendererRequirements) | ShaderFeatures.ReflectionProbeBoxProjection;
             m_TestHelper.AssertShaderFeaturesAndReset(expected, actual);
-
-
         }
 
 

Tests/SRPTests/Projects/SRP_SmokeTest/Assets/CommonAssets/Editor/Setup/SetupGraphicsTestCases.cs

@@ -19,4 +19,4 @@
         "UNITY_INCLUDE_TESTS"
     ],
     "versionDefines": []
-}
+}