HDRP Compositor related fixes (#730)

pmavridis · web-flow · commit 86fae393e20c · 2020-06-04T17:05:11.000+02:00
* Fixes for the compositor test

* Enable the compoositor test in build settings

* Avoid gc alloc, hide internal components from vomume menu

* Vulkan and DX12 screens, adjust compositor UI refresh
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9800_Compositor.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9800_Compositor.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f20b48b0beb6c8886182e197f3d2d2434fb73f09af5766457742cc23e9502154
-size 105162
+oid sha256:99799b9655b931583b1a3ab865972e65385a8b0c2ac6d2693a4d8ae5b8240a30
+size 85848
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9800_Compositor.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9800_Compositor.png.meta
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9800_Compositor.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9800_Compositor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99799b9655b931583b1a3ab865972e65385a8b0c2ac6d2693a4d8ae5b8240a30
+size 85848
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9800_Compositor.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9800_Compositor.png.meta
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9800_Compositor.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9800_Compositor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8380e9c68284ad522249e4fbaf45d13b831ce80e11b0fa29e3f5d85953901b58
+size 98144
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9800_Compositor.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9800_Compositor.png.meta
diff --git a/TestProjects/HDRP_Tests/ProjectSettings/EditorBuildSettings.asset b/TestProjects/HDRP_Tests/ProjectSettings/EditorBuildSettings.asset
@@ -572,6 +572,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API.unity
     guid: 3d584f34970fc5c44871961e3178f4ce
+  - enabled: 1
+    path: Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity
+    guid: 708bd21bc204d2342bc1702a5a6de1d3
   - enabled: 1
     path: Assets/GraphicTests/Scenes/9x_Other/9801_ShurikenLightModule.unity
     guid: d50ee167e49a2d74988347d7888c3613
diff --git a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositorWindow.cs b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositorWindow.cs
@@ -22,6 +22,7 @@ static partial class Styles
         CompositionManagerEditor m_Editor;
         Vector2 m_ScrollPosition = Vector2.zero;
         bool m_RequiresRedraw = false;
+        float m_TimeSinceLastRepaint = 0;
 
         [MenuItem("Window/Render Pipeline/HD Render Pipeline Compositor", false, 10400)]
         static void Init()
@@ -34,12 +35,16 @@ static void Init()
 
         void Update()
         {
-            // This ensures that layer thumbnails are updated every frame (for video layers)
-            Repaint();
+            m_TimeSinceLastRepaint += Time.deltaTime;
+
+            // This ensures that layer thumbnails are updated at least 4 times per second (redrawing the UI on every frame is too CPU intensive)
+            if (m_TimeSinceLastRepaint > 0.25f)
+                Repaint();
         }
 
         void OnGUI()
         {
+            m_TimeSinceLastRepaint = 0;
             CompositionManager compositor = CompositionManager.GetInstance();
             bool enableCompositor = false;
             if (compositor)
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs
@@ -5,7 +5,9 @@
 
 namespace UnityEngine.Rendering.HighDefinition.Compositor
 {
-    [Serializable]
+    // Injects an external alpha texture into the alpha channel. Used for controlling which pixels will be affected by post processing. 
+    // Use VolumeComponentDeprecated to hide the component from the volume menu (it's for internal compositor use only)
+    [Serializable, VolumeComponentDeprecated]
     internal sealed class AlphaInjection : CustomPostProcessVolumeComponent, IPostProcessComponent
     {
         internal class ShaderIDs
@@ -31,8 +33,8 @@ public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source,
         {
             Debug.Assert(m_Material != null);
 
-            //TODO: can we detect this before we get here?
-            AdditionalCompositorData layerData = camera.camera.gameObject.GetComponent<AdditionalCompositorData>();
+            AdditionalCompositorData layerData = null;
+            camera.camera.gameObject.TryGetComponent<AdditionalCompositorData>(out layerData);
             if (layerData == null || layerData.layerFilters == null)
             {
                 HDUtils.BlitCameraTexture(cmd, source, destination);
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs
@@ -7,7 +7,8 @@ namespace UnityEngine.Rendering.HighDefinition.Compositor
 {
     // Custom post-processing pass that performs chroma keying
     // Shader adapted from: https://github.com/keijiro/ProcAmp
-    [Serializable]
+    // Use VolumeComponentDeprecated to hide the component from the volume menu (it's for internal use only)
+    [Serializable, VolumeComponentDeprecated]
     internal sealed class ChromaKeying : CustomPostProcessVolumeComponent, IPostProcessComponent
     {
         internal class ShaderIDs
@@ -35,7 +36,8 @@ public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source,
         {
             Debug.Assert(m_Material != null);
 
-            AdditionalCompositorData layerData = camera.camera.gameObject.GetComponent<AdditionalCompositorData>();
+            AdditionalCompositorData layerData = null;
+            camera.camera.gameObject.TryGetComponent<AdditionalCompositorData>(out layerData);
 
             if (activate.value == false || layerData == null || layerData.layerFilters == null)
             {
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionLayer.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionLayer.cs
@@ -523,7 +523,7 @@ public bool ValidateRTSize(int referenceWidth, int referenceHeight)
             }
 
             float scale = EnumToScale(m_ResolutionScale);
-            return ((m_RenderTarget.width == referenceWidth * scale) && (m_RenderTarget.height == referenceHeight * scale));
+            return ((m_RenderTarget.width == Mathf.FloorToInt(referenceWidth * scale)) && (m_RenderTarget.height == Mathf.FloorToInt(referenceHeight * scale)));
         }
 
         public void SetupClearColor()
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs
@@ -693,8 +693,7 @@ void CustomRender(ScriptableRenderContext context, HDCamera camera)
             {
                 m_ShaderVariablesGlobalCB._ViewProjMatrix = m_ViewProjMatrixFlipped;
                 ConstantBuffer.PushGlobal(cmd, m_ShaderVariablesGlobalCB, HDShaderIDs._ShaderVariablesGlobal);
-                cmd.Blit(null, BuiltinRenderTextureType.CurrentActive, m_Material, m_Material.FindPass("ForwardOnly"));
-                cmd.Blit(BuiltinRenderTextureType.CurrentActive, camera.camera.targetTexture);
+                cmd.Blit(null, camera.camera.targetTexture, m_Material, m_Material.FindPass("ForwardOnly"));
             }
             else
             {
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CustomClear.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CustomClear.cs
@@ -43,7 +43,8 @@ protected override void Setup(ScriptableRenderContext renderContext, CommandBuff
         protected override void Execute(CustomPassContext ctx)
         {
             // Executed every frame for all the camera inside the pass volume
-            AdditionalCompositorData layerData = ctx.hdCamera.camera.gameObject.GetComponent<AdditionalCompositorData>();
+            AdditionalCompositorData layerData = null;
+            ctx.hdCamera.camera.gameObject.TryGetComponent<AdditionalCompositorData>(out layerData);
             if (layerData == null || layerData.clearColorTexture == null)
             {
                 return;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`
`6`	`6`	`namespace UnityEngine.Rendering.HighDefinition.Compositor`
`7`	`7`	`{`
`8`		`- [Serializable]`
	`8`	`+ // Injects an external alpha texture into the alpha channel. Used for controlling which pixels will be affected by post processing.`
	`9`	`+ // Use VolumeComponentDeprecated to hide the component from the volume menu (it's for internal compositor use only)`
	`10`	`+ [Serializable, VolumeComponentDeprecated]`
`9`	`11`	`internal sealed class AlphaInjection : CustomPostProcessVolumeComponent, IPostProcessComponent`
`10`	`12`	`{`
`11`	`13`	`internal class ShaderIDs`
`@@ -31,8 +33,8 @@ public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source,`
`31`	`33`	`{`
`32`	`34`	`Debug.Assert(m_Material != null);`
`33`	`35`
`34`		`- //TODO: can we detect this before we get here?`
`35`		`- AdditionalCompositorData layerData = camera.camera.gameObject.GetComponent<AdditionalCompositorData>();`
	`36`	`+ AdditionalCompositorData layerData = null;`
	`37`	`+ camera.camera.gameObject.TryGetComponent<AdditionalCompositorData>(out layerData);`
`36`	`38`	`if (layerData == null \|\| layerData.layerFilters == null)`
`37`	`39`	`{`
`38`	`40`	`HDUtils.BlitCameraTexture(cmd, source, destination);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ namespace UnityEngine.Rendering.HighDefinition.Compositor`
`7`	`7`	`{`
`8`	`8`	`// Custom post-processing pass that performs chroma keying`
`9`	`9`	`// Shader adapted from: https://github.com/keijiro/ProcAmp`
`10`		`- [Serializable]`
	`10`	`+ // Use VolumeComponentDeprecated to hide the component from the volume menu (it's for internal use only)`
	`11`	`+ [Serializable, VolumeComponentDeprecated]`
`11`	`12`	`internal sealed class ChromaKeying : CustomPostProcessVolumeComponent, IPostProcessComponent`
`12`	`13`	`{`
`13`	`14`	`internal class ShaderIDs`
`@@ -35,7 +36,8 @@ public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source,`
`35`	`36`	`{`
`36`	`37`	`Debug.Assert(m_Material != null);`
`37`	`38`
`38`		`- AdditionalCompositorData layerData = camera.camera.gameObject.GetComponent<AdditionalCompositorData>();`
	`39`	`+ AdditionalCompositorData layerData = null;`
	`40`	`+ camera.camera.gameObject.TryGetComponent<AdditionalCompositorData>(out layerData);`
`39`	`41`
`40`	`42`	`if (activate.value == false \|\| layerData == null \|\| layerData.layerFilters == null)`
`41`	`43`	`{`