HDRP Compositor related fixes

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

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)

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);

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)
             {

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()

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
             {

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;