[2022.1][URP] Decal fixes

com.unity.render-pipelines.universal/CHANGELOG.md

@@ -34,6 +34,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix for rendering thumbnails. [case 1348209](https://issuetracker.unity3d.com/issues/preview-of-assets-do-not-show-in-the-project-window)
 - Fixed a regression bug where XR camera postion can not be modified in beginCameraRendering [case 1365000]
 - Fixed an issue in where installing the Adaptive Performance package caused errors to the inspector UI [1368161](https://issuetracker.unity3d.com/issues/urp-package-throws-compilation-error-cs1525-when-imported-together-with-adaptive-performance-package)
+- Fixed decals to work with native render pass [case 1353141](https://issuetracker.unity3d.com/issues/urp-decals-are-not-visible-in-game-view-after-modifying-urp-asset-properties)
+- Fixed decals to work with render scale [1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings)
 - Fixed a regression where filtering the scene view yielded incorrect visual results [1360233](https://issuetracker.unity3d.com/product/unity/issues/guid/1360233)
 - Fixed disabled debug lighting modes on Vulkan and OpenGL following a shader compiler fix. [case 1334240]
 - Fixed an issue in where the Convert Renderering Settings would cause a freeze. [case 1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings)

com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs

@@ -24,12 +24,17 @@ internal class DBufferRenderPass : ScriptableRenderPass
         private int m_DBufferCount;
         private ProfilingSampler m_ProfilingSampler;
 
+        private RenderTargetHandle m_DBufferDepth;
+        private RenderTargetHandle m_CameraDepthTexture;
+        private RenderTargetHandle m_CameraDepthAttachment;
+
         internal DeferredLights deferredLights { get; set; }
         private bool isDeferred => deferredLights != null;
         internal RenderTargetIdentifier[] dBufferColorIndentifiers { get; private set; }
-        internal RenderTargetIdentifier dBufferDepthIndentifier { get; private set; }
-        internal RenderTargetIdentifier cameraDepthTextureIndentifier { get; private set; }
-        internal RenderTargetIdentifier cameraDepthAttachmentIndentifier { get; private set; }
+
+        internal RenderTargetHandle dBufferDepth => m_DBufferDepth;
+        internal RenderTargetHandle cameraDepthTexture => m_CameraDepthTexture;
+        internal RenderTargetHandle cameraDepthAttachment => m_CameraDepthAttachment;
 
         public DBufferRenderPass(Material dBufferClear, DBufferSettings settings, DecalDrawDBufferSystem drawSystem)
         {
@@ -51,9 +56,9 @@ public DBufferRenderPass(Material dBufferClear, DBufferSettings settings, DecalD
                 dBufferColorIndentifiers[dbufferIndex] = new RenderTargetIdentifier(s_DBufferNames[dbufferIndex]);
             m_DBufferCount = dBufferCount;
 
-            dBufferDepthIndentifier = new RenderTargetIdentifier(s_DBufferDepthName);
-            cameraDepthTextureIndentifier = new RenderTargetIdentifier("_CameraDepthTexture");
-            cameraDepthAttachmentIndentifier = new RenderTargetIdentifier("_CameraDepthAttachment");
+            m_DBufferDepth.Init(s_DBufferDepthName);
+            m_CameraDepthTexture.Init("_CameraDepthTexture");
+            m_CameraDepthAttachment.Init("_CameraDepthAttachment");
         }
 
         public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData)
@@ -97,12 +102,12 @@ public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderin
                 depthDesc.depthStencilFormat = renderingData.cameraData.cameraTargetDescriptor.depthStencilFormat;
                 depthDesc.msaaSamples = 1;
 
-                cmd.GetTemporaryRT(Shader.PropertyToID(s_DBufferDepthName), depthDesc);
-                depthIdentifier = dBufferDepthIndentifier;
+                cmd.GetTemporaryRT(m_DBufferDepth.id, depthDesc);
+                depthIdentifier = m_DBufferDepth.Identifier();
             }
             else
             {
-                depthIdentifier = deferredLights.DepthAttachmentIdentifier;
+                depthIdentifier = m_CameraDepthAttachment.Identifier();
             }
 
             ConfigureTarget(dBufferColorIndentifiers, depthIdentifier);
@@ -184,7 +189,7 @@ public override void OnCameraCleanup(CommandBuffer cmd)
             }
 
             if (!isDeferred)
-                cmd.ReleaseTemporaryRT(Shader.PropertyToID(s_DBufferDepthName));
+                cmd.ReleaseTemporaryRT(m_DBufferDepth.id);
         }
     }
 }

com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs

@@ -341,7 +341,6 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData
             m_ScreenSpaceSettings = GetScreenSpaceSettings();
 
             m_CopyDepthMaterial = CoreUtils.CreateEngineMaterial(m_CopyDepthPS);
-            m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingPrePasses, m_CopyDepthMaterial);
 
             m_DBufferClearMaterial = CoreUtils.CreateEngineMaterial(m_DBufferClear);
 
@@ -371,7 +370,6 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData
             switch (m_Technique)
             {
                 case DecalTechnique.ScreenSpace:
-                    m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingOpaques, m_DBufferClearMaterial);
                     m_DecalDrawScreenSpaceSystem = new DecalDrawScreenSpaceSystem(m_DecalEntityManager);
                     m_ScreenSpaceDecalRenderPass = new DecalScreenSpaceRenderPass(m_ScreenSpaceSettings, intermediateRendering ? m_DecalDrawScreenSpaceSystem : null);
                     break;
@@ -380,12 +378,12 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData
 
                     m_DeferredLights = universalRenderer.deferredLights;
 
-                    m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingOpaques, m_DBufferClearMaterial);
                     m_DrawGBufferSystem = new DecalDrawGBufferSystem(m_DecalEntityManager);
                     m_GBufferRenderPass = new DecalGBufferRenderPass(m_ScreenSpaceSettings, intermediateRendering ? m_DrawGBufferSystem : null);
                     break;
 
                 case DecalTechnique.DBuffer:
+                    m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingPrePasses, m_CopyDepthMaterial);
                     m_DecalDrawDBufferSystem = new DecalDrawDBufferSystem(m_DecalEntityManager);
                     m_DBufferRenderPass = new DBufferRenderPass(m_DBufferClearMaterial, m_DBufferSettings, m_DecalDrawDBufferSystem);
 
@@ -471,15 +469,17 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD
                     if (universalRenderer.actualRenderingMode == RenderingMode.Deferred)
                     {
                         m_CopyDepthPass.Setup(
-                            new RenderTargetHandle(m_DBufferRenderPass.cameraDepthAttachmentIndentifier),
-                            new RenderTargetHandle(m_DBufferRenderPass.cameraDepthTextureIndentifier)
+                            m_DBufferRenderPass.cameraDepthAttachment,
+                            m_DBufferRenderPass.cameraDepthTexture
                         );
+
+                        m_CopyDepthPass.AllocateRT = false;
                     }
                     else
                     {
                         m_CopyDepthPass.Setup(
-                            new RenderTargetHandle(m_DBufferRenderPass.cameraDepthTextureIndentifier),
-                            new RenderTargetHandle(m_DBufferRenderPass.dBufferDepthIndentifier)
+                            m_DBufferRenderPass.cameraDepthTexture,
+                            m_DBufferRenderPass.dBufferDepth
                         );
 
                         m_CopyDepthPass.CopyToDepth = true;

com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs

@@ -218,7 +218,7 @@ void SetPerCameraShaderVariables(CommandBuffer cmd, ref CameraData cameraData)
             cmd.SetGlobalVector(ShaderPropertyId.zBufferParams, zBufferParams);
             cmd.SetGlobalVector(ShaderPropertyId.orthoParams, orthoParams);
 
-            cmd.SetGlobalVector(ShaderPropertyId.screenSize, new Vector4(cameraWidth, cameraHeight, 1.0f / cameraWidth, 1.0f / cameraHeight));
+            cmd.SetGlobalVector(ShaderPropertyId.screenSize, new Vector4(scaledCameraWidth, scaledCameraHeight, 1.0f / scaledCameraWidth, 1.0f / scaledCameraHeight));
         }
 
         /// <summary>