Graphics/urp/bugfix/uum 68008

Various fixes for Rendering Debugger "Map Overlays" for URP Render Graph and non-RenderGraph paths.

Author: eh-unity

Packages/com.unity.render-pipelines.universal/Documentation~/features/rendering-debugger.md

@@ -147,10 +147,11 @@ The properties in this section let you visualize different rendering features.
 
 | **Property**                   | **Description**                                              |
 | ------------------------------ | ------------------------------------------------------------ |
-| **Map Overlays**               | Specifies which render pipeline texture to overlay on the screen. The options are:<ul><li>**None**: Renders the scene normally without a texture overlay.</li><li>**Depth**: Overlays the camera's depth texture on the screen.</li><li>**Additional Lights Shadow Map**: Overlays the [shadow map](https://docs.unity3d.com/Manual/shadow-mapping.html) that contains shadows cast by lights other than the main directional light.</li><li>**Main Light Shadow Map**: Overlays the shadow map that contains shadows cast by the main directional light.</li></ul> |
+| **Map Overlays**               | Specifies which render pipeline texture to overlay on the screen. The options are:<ul><li>**None**: Renders the scene normally without a texture overlay.</li><li>**Depth**: Overlays the camera's depth texture on the screen.</li><li>**Motion Vector**: Overlays the camera's motion vector texture on the screen.</li><li>**Additional Lights Shadow Map**: Overlays the [shadow map](https://docs.unity3d.com/Manual/shadow-mapping.html) that contains shadows cast by lights other than the main directional light.</li><li>**Main Light Shadow Map**: Overlays the shadow map that contains shadows cast by the main directional light.</li><li>**Additional Lights Cookie Atlas**: Overlays the light cookie atlas texture that contains patterns cast by lights other than the main directional light.</li><li>**Reflection Probe Atlas**: Overlays the reflection probe atlas texture that contains the reflection textures at the probe locations.</li></ul> |
 | **&nbsp;&nbsp;Map Size**       | The width and height of the overlay texture as a percentage of the view window URP displays it in. For example, a value of **50** fills up a quarter of the screen (50% of the width and 50% of the height). |
 | **HDR**                        | Indicates whether to use [high dynamic range (HDR)](https://docs.unity3d.com/Manual/HDR.html) to render the scene. Enabling this property only has an effect if you enable **HDR** in your URP Asset. |
 | **MSAA**                       | Indicates whether to use [Multisample Anti-aliasing (MSAA)](./../anti-aliasing.md#msaa) to render the scene. Enabling this property only has an effect if:<ul><li>You set **Anti Aliasing (MSAA)** to a value other than **Disabled** in your URP Asset.</li><li>You use the Game View. MSAA has no effect in the Scene View.</li></ul> |
+| **TAA Debug Mode**             | Specifies which Temporal Anti-aliasing debug mode to use. The options are:<ul><li>**None**: Renders the scene normally without a debug mode.</li><li>**Show Raw Frame**: Renders the screen with the color input Temporal Anti-aliasing currently uses.</li><li>**Show Raw Frame No Jitter**: Renders the screen with the color input TAA currently uses, and disables camera jitter.</li><li>**Show Clamped History**: Renders the screen with the color history that TAA has accumulated and corrected.</li></ul> |
 | **Post-processing**            | Specifies how URP applies post-processing. The options are:<ul><li>**Disabled**: Disables post-processing.</li><li>**Auto**: Unity enables or disables post-processing depending on the currently active debug modes. If color changes from post-processing would change the meaning of a debug mode's pixel, Unity disables post-processing. If no debug modes are active, or if color changes from post-processing don't change the meaning of the active debug modes' pixels, Unity enables post-processing.</li><li>**Enabled**: Applies post-processing to the image that the camera captures.</li></ul> |
 | **Additional Wireframe Modes** | Specifies whether and how to render wireframes for meshes in your scene. The options are:<ul><li>**None**: Doesn't render wireframes.</li><li>**Wireframe**: Exclusively renders edges for meshes in your scene. In this mode, you can see the wireframe for meshes through the wireframe for closer meshes.</li><li>**Solid Wireframe**: Exclusively renders edges and faces for meshes in your scene. In this mode, the faces of each wireframe mesh hide edges behind them.</li><li>**Shaded Wireframe**: Renders edges for meshes as an overlay. In this mode, Unity renders the scene in color and overlays the wireframe over the top.</li></ul> |
 | **Overdraw**                   | Indicates whether to render the overdraw debug view. This is useful to check where Unity draws pixels over one other. |

Packages/com.unity.render-pipelines.universal/Runtime/Debug/DebugHandler.cs

@@ -21,6 +21,7 @@ class DebugHandler : IDebugDisplaySettingsQuery
         static readonly int k_DebugTextureNoStereoPropertyId = Shader.PropertyToID("_DebugTextureNoStereo");
         static readonly int k_DebugTextureDisplayRect = Shader.PropertyToID("_DebugTextureDisplayRect");
         static readonly int k_DebugRenderTargetSupportsStereo = Shader.PropertyToID("_DebugRenderTargetSupportsStereo");
+        static readonly int k_DebugRenderTargetRangeRemap = Shader.PropertyToID("_DebugRenderTargetRangeRemap");
 
         // Material settings...
         static readonly int k_DebugMaterialModeId = Shader.PropertyToID("_DebugMaterialMode");
@@ -83,6 +84,7 @@ class DebugHandler : IDebugDisplaySettingsQuery
         bool m_HasDebugRenderTarget;
         bool m_DebugRenderTargetSupportsStereo;
         Vector4 m_DebugRenderTargetPixelRect;
+        Vector4 m_DebugRenderTargetRangeRemap;
         RTHandle m_DebugRenderTarget;
 
         RTHandle m_DebugFontTexture;
@@ -295,12 +297,13 @@ internal void SetupShaderProperties(RasterCommandBuffer cmd, int passIndex = 0)
             }
         }
 
-        internal void SetDebugRenderTarget(RTHandle renderTarget, Rect displayRect, bool supportsStereo)
+        internal void SetDebugRenderTarget(RTHandle renderTarget, Rect displayRect, bool supportsStereo, Vector4 dataRangeRemap)
         {
             m_HasDebugRenderTarget = true;
             m_DebugRenderTargetSupportsStereo = supportsStereo;
             m_DebugRenderTarget = renderTarget;
             m_DebugRenderTargetPixelRect = new Vector4(displayRect.x, displayRect.y, displayRect.width, displayRect.height);
+            m_DebugRenderTargetRangeRemap = dataRangeRemap;
         }
 
         internal void ResetDebugRenderTarget()
@@ -320,6 +323,7 @@ class DebugFinalValidationPassData
 
             public Vector4 debugRenderTargetPixelRect;
             public int debugRenderTargetSupportsStereo;
+            public Vector4 debugRenderTargetRangeRemap;
 
             public TextureHandle debugFontTextureHandle;
 
@@ -341,6 +345,7 @@ DebugFinalValidationPassData InitDebugFinalValidationPassData(DebugFinalValidati
 
             passData.debugRenderTargetPixelRect = m_DebugRenderTargetPixelRect;
             passData.debugRenderTargetSupportsStereo = m_DebugRenderTargetSupportsStereo ? 1 : 0;
+            passData.debugRenderTargetRangeRemap = m_DebugRenderTargetRangeRemap;
 
             passData.debugFontTextureHandle = TextureHandle.nullHandle;
 
@@ -375,6 +380,7 @@ static void UpdateShaderGlobalPropertiesForFinalValidationPass(RasterCommandBuff
 
                 cmd.SetGlobalVector(k_DebugTextureDisplayRect, data.debugRenderTargetPixelRect);
                 cmd.SetGlobalInteger(k_DebugRenderTargetSupportsStereo, data.debugRenderTargetSupportsStereo);
+                cmd.SetGlobalVector(k_DebugRenderTargetRangeRemap, data.debugRenderTargetRangeRemap);
             }
 
             var renderingSettings = data.renderingSettings;

Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs

@@ -275,6 +275,8 @@ public void Clear(CommandBuffer cmd)
 
         internal bool IsKeywordLightCookieEnabled { get; private set; }
 
+        internal RTHandle AdditionalLightsCookieAtlasTexture => m_AdditionalLightsCookieAtlas?.AtlasTexture;
+
         public LightCookieManager(ref Settings settings)
         {
             m_Settings = settings;

Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs

@@ -453,6 +453,8 @@ internal override void ReleaseRenderTargets()
 
         private void SetupFinalPassDebug(UniversalCameraData cameraData)
         {
+            //NOTE: See SetupRenderGraphFinalPassDebug for RG.
+
             if ((DebugHandler != null) && DebugHandler.IsActiveForCamera(cameraData.isPreviewCamera))
             {
                 if (DebugHandler.TryGetFullscreenDebugMode(out DebugFullScreenMode fullScreenDebugMode, out int textureHeightPercent) &&
@@ -466,46 +468,68 @@ private void SetupFinalPassDebug(UniversalCameraData cameraData)
                     var height = relativeSize * screenHeight;
                     var width = relativeSize * screenWidth;
 
+                    RenderTexture tex = null;
                     if (fullScreenDebugMode == DebugFullScreenMode.ReflectionProbeAtlas)
                     {
-                        // Ensure that atlas is not stretched, but doesn't take up more than the percentage in any dimension.
-                        var texture = m_ForwardLights.reflectionProbeManager.atlasRT;
-                        var targetWidth = height * texture.width / texture.height;
-                        if (targetWidth > width)
-                        {
-                            height = width * texture.height / texture.width;
-                        }
-                        else
-                        {
-                            width = targetWidth;
-                        }
+                        tex = m_ForwardLights.reflectionProbeManager.atlasRT;
+                    }
+                    else if (fullScreenDebugMode == DebugFullScreenMode.MainLightShadowMap)
+                    {
+                        tex = m_MainLightShadowCasterPass.m_MainLightShadowmapTexture.rt;
+                    }
+                    else if (fullScreenDebugMode == DebugFullScreenMode.AdditionalLightsShadowMap)
+                    {
+                        tex = m_AdditionalLightsShadowCasterPass.m_AdditionalLightsShadowmapHandle.rt;
                     }
+                    else if (fullScreenDebugMode == DebugFullScreenMode.AdditionalLightsCookieAtlas && m_LightCookieManager != null)
+                    {
+                        tex = m_LightCookieManager?.AdditionalLightsCookieAtlasTexture?.rt;
+                    }
+
+                    if(tex != null) CorrectForTextureAspectRatio(ref width, ref height, tex.width, tex.height);
 
                     float normalizedSizeX = width / screenWidth;
                     float normalizedSizeY = height / screenHeight;
 
                     Rect normalizedRect = new Rect(1 - normalizedSizeX, 1 - normalizedSizeY, normalizedSizeX, normalizedSizeY);
+                    Vector4 dataRangeRemap = Vector4.zero; // zero = off, .x = old min, .y = old max, .z = new min, .w = new max
 
                     switch (fullScreenDebugMode)
                     {
                         case DebugFullScreenMode.Depth:
                         {
-                            DebugHandler.SetDebugRenderTarget(m_DepthTexture, normalizedRect, true);
+                            DebugHandler.SetDebugRenderTarget(m_DepthTexture, normalizedRect, true, dataRangeRemap);
+                            break;
+                        }
+                        case DebugFullScreenMode.MotionVector:
+                        {
+                            // Motion vectors are in signed UV space, zoom in for visualization. (note: another option is to use (dir.xy, mag) visualization)
+                            const float zoom = 0.01f;
+                            dataRangeRemap.x = -zoom;
+                            dataRangeRemap.y = zoom;
+                            dataRangeRemap.z = 0;
+                            dataRangeRemap.w = 1.0f;
+                            DebugHandler.SetDebugRenderTarget(m_MotionVectorColor, normalizedRect, true, dataRangeRemap);
                             break;
                         }
                         case DebugFullScreenMode.AdditionalLightsShadowMap:
                         {
-                            DebugHandler.SetDebugRenderTarget(m_AdditionalLightsShadowCasterPass.m_AdditionalLightsShadowmapHandle, normalizedRect, false);
+                            DebugHandler.SetDebugRenderTarget(m_AdditionalLightsShadowCasterPass.m_AdditionalLightsShadowmapHandle, normalizedRect, false, dataRangeRemap);
                             break;
                         }
                         case DebugFullScreenMode.MainLightShadowMap:
                         {
-                            DebugHandler.SetDebugRenderTarget(m_MainLightShadowCasterPass.m_MainLightShadowmapTexture, normalizedRect, false);
+                            DebugHandler.SetDebugRenderTarget(m_MainLightShadowCasterPass.m_MainLightShadowmapTexture, normalizedRect, false, dataRangeRemap);
+                            break;
+                        }
+                        case DebugFullScreenMode.AdditionalLightsCookieAtlas:
+                        {
+                            DebugHandler.SetDebugRenderTarget(m_LightCookieManager?.AdditionalLightsCookieAtlasTexture, normalizedRect, false, dataRangeRemap);
                             break;
                         }
                         case DebugFullScreenMode.ReflectionProbeAtlas:
                         {
-                            DebugHandler.SetDebugRenderTarget(m_ForwardLights.reflectionProbeManager.atlasRTHandle, normalizedRect, false);
+                            DebugHandler.SetDebugRenderTarget(m_ForwardLights.reflectionProbeManager.atlasRTHandle, normalizedRect, false, dataRangeRemap);
                             break;
                         }
                         default: