[content automatically redacted] touching PlatformDependent folder

Author: Adrian1066

Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl

@@ -408,18 +408,27 @@ float4 EvaluateCookie_Punctual(LightLoopContext lightLoopContext, LightData ligh
         float z = positionLS.z;
         float r = light.range;
 
+        cookie.a = 1.0;
         // Box lights have no range attenuation, so we must clip manually.
-        bool isInBounds = Max3(abs(positionCS.x), abs(positionCS.y), abs(z - 0.5 * r) - 0.5 * r + 1) <= light.boxLightSafeExtent;
-        if (lightType != GPULIGHTTYPE_PROJECTOR_PYRAMID && lightType != GPULIGHTTYPE_PROJECTOR_BOX)
+        if ( Max3(abs(positionCS.x), abs(positionCS.y), abs(z - 0.5 * r) - 0.5 * r + 1) > light.boxLightSafeExtent )
         {
-            isInBounds = isInBounds && (dot(positionCS, positionCS) <= light.iesCut * light.iesCut);
+            cookie.a = 0.0;
+        }
+        else
+        {
+            if (lightType != GPULIGHTTYPE_PROJECTOR_PYRAMID && lightType != GPULIGHTTYPE_PROJECTOR_BOX)
+            {
+                float iesCut = light.iesCut;
+                if (dot(positionCS, positionCS) > (iesCut * iesCut))
+                {
+                    cookie.a = 0;
+                }
+            }
         }
-
         float2 positionNDC = positionCS * 0.5 + 0.5;
 
         // Manually clamp to border (black).
         cookie.rgb = SampleCookie2D(positionNDC, light.cookieScaleOffset, lod);
-        cookie.a   = isInBounds ? 1.0 : 0.0;
     }
 
 #else

Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs

@@ -25,7 +25,7 @@ public class HDRP_Runtime_Graphics_Tests
     )]
     [IgnoreGraphicsTest(
         "001-HDTemplate$",
-        "Huge divergence: missing textures, wrong tonemapping, wrong reflections, etc. Needs further investigation.",
+        "Small issue with incorrect rendering on bubble. Some half overflow issue and flickering artifacts. Will need image update when fixed",
         runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch }
     )]
     [IgnoreGraphicsTest(
@@ -44,22 +44,12 @@ public class HDRP_Runtime_Graphics_Tests
         "",
         graphicsDeviceTypes: new GraphicsDeviceType[] { GraphicsDeviceType.Metal }
     )]
-    [IgnoreGraphicsTest(
-        "002-HDMaterials$",
-        "Multiple materials are fully black or completely missing.",
-        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch }
-    )]
     [IgnoreGraphicsTest(
         "004-CloudsFlaresDecals$",
         "Area with cloud-coverage is blue on Intel-based MacOS (CI).",
         graphicsDeviceTypes: new[] { GraphicsDeviceType.Metal },
         architectures: new [] { Architecture.X64 }
     )]
-    [IgnoreGraphicsTest(
-        "006-Compositor$",
-        "Quite different compositing results from the reference (strong shadows on the BG + character not-so blue).",
-        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch }
-    )]
     [IgnoreGraphicsTest(
         "007-BasicAPV$",
         "https://jira.unity3d.com/browse/UUM-54029",
@@ -69,12 +59,12 @@ public class HDRP_Runtime_Graphics_Tests
     [IgnoreGraphicsTest(
         "011-HighQualityLines$",
         "Getting NVN_QUEUE_GET_ERROR_RESULT_GPU_ERROR_MMU_FAULT GPU Error. Needs further investigation.",
-        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch }
+        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch, RuntimePlatform.Switch2 }
     )]
     [IgnoreGraphicsTest(
         "012-SVL_Check$",
         "https://jira.unity3d.com/browse/UUM-70791",
-        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.PS4, RuntimePlatform.PS5, RuntimePlatform.Switch }
+        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.PS4, RuntimePlatform.PS5, RuntimePlatform.Switch, RuntimePlatform.Switch2 }
     )]
     public IEnumerator Run(SceneGraphicsTestCase testCase)
     {