Fix custom pass after post process buffer #1072

Author: Antoine Lelievre

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 - Pre-warm the RTHandle system to reduce the amount of memory allocations and the total memory needed at all points. 
 - Appropriately constraint blend distance of reflection probe while editing with the inspector (case 1248931)
+- Fixed fallback for ray tracing and light layers (1258837).
+- Fixed Sorting Priority not displayed correctly in the DrawRenderers custom pass UI.
+
+### Changed
+- The `CustomPassLoadCameraColor` and `CustomPassSampleCameraColor` functions now returns the correct color buffer when used in after post process instead of the color pyramid (which didn't had post processes).
 
 ## [7.4.3] - 2020-08-06
 

com.unity.render-pipelines.high-definition/Documentation~/Custom-Pass.md

@@ -79,7 +79,7 @@ float4 FullScreenPass(Varyings varyings) : SV_Target
 
     // Load the camera color buffer at the mip 0 if we're not at the before rendering injection point
     if (_CustomPassInjectionPoint != CUSTOMPASSINJECTIONPOINT_BEFORE_RENDERING)
-        color = float4(CustomPassSampleCameraColor(posInput.positionNDC.xy, 0), 1);
+        color = float4(CustomPassLoadCameraColor(varyings.positionCS.xy, 0), 1);
 
     // Add your custom pass code here
 
@@ -98,6 +98,7 @@ In this snippet, we fetch a lot of useful input data that you might need in your
 | **Sampling the camera color with lods is only available in after and before post process passes**. Calling `CustomPassSampleCameraColor` at before rendering will only return black. |
 | **DrawRenderers Pass chained with FullScreen Pass**: In multi-pass setups where you draw objects in the camera color buffer and then read it from a fullscreen custom pass, you'll not see the objects you've drawn in the passes before your fullscreen pass (unless you are in Before Transparent). |
 | **MSAA**: When dealing with MSAA, you must check that the `Fetch color buffer` boolean is correctly setup because it will determine whether or not you'll be able to fetch the color buffer in this pass or not. |
+| **Before Pre-Refraction and After post-process**: On these injection points, the camera color buffer set as the target for the fullscreen pass is the same as the one you can access inside the shader. Because the camera color buffer is the target, and because of read/write restrictions on certain platforms, you cannot directly sample from the camera color buffer inside the shader. Instead, you need to split your effect into two passes and use the custom color buffer as an intermediate buffer. This avoids reading and writing simultaneously to the same buffer. |
 
 ### DrawRenderers Custom Pass
 

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/DrawRenderersCustomPassDrawer.cs

@@ -161,6 +161,7 @@ protected override void DoPassGUI(SerializedProperty customPass, Rect rect)
 #endif
 
                 // TODO: remove all this code when the fix for SerializedReference lands
+                m_SortingCriteria.intValue = (int)(SortingCriteria)EditorGUI.EnumFlagsField(rect, Styles.sortingCriteria, (SortingCriteria)m_SortingCriteria.intValue);
                 // EditorGUI.PropertyField(rect, m_SortingCriteria, Styles.sortingCriteria);
                 m_SortingCriteria.intValue = (int)(SortingCriteria)EditorGUI.EnumPopup(rect, Styles.sortingCriteria, (SortingCriteria)m_SortingCriteria.intValue);
                 rect.y += Styles.defaultLineSpace;

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStringConstants.cs

@@ -445,6 +445,7 @@ static class HDShaderIDs
         public static readonly int _CustomDepthTexture = Shader.PropertyToID("_CustomDepthTexture");
         public static readonly int _CustomColorTexture = Shader.PropertyToID("_CustomColorTexture");
         public static readonly int _CustomPassInjectionPoint = Shader.PropertyToID("_CustomPassInjectionPoint");
+        public static readonly int _AfterPostProcessColorBuffer = Shader.PropertyToID("_AfterPostProcessColorBuffer");
 
         public static readonly int _InputCubemap = Shader.PropertyToID("_InputCubemap");
         public static readonly int _Mipmap = Shader.PropertyToID("_Mipmap");

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassCommon.hlsl

@@ -10,6 +10,10 @@
 float _CustomPassInjectionPoint;
 float _FadeValue;
 
+// This texture is only available in after post process and contains the result of post processing effects.
+// While SampleCameraColor still returns the color pyramid without post processes
+TEXTURE2D_X(_AfterPostProcessColorBuffer);
+
 float3 CustomPassSampleCameraColor(float2 uv, float lod, bool uvGuards = true)
 {
     if (uvGuards)
@@ -22,6 +26,7 @@ float3 CustomPassSampleCameraColor(float2 uv, float lod, bool uvGuards = true)
         // Also, we don't use _RTHandleScaleHistory to sample because the color pyramid bound is the actual camera color buffer which is at the resolution of the camera
         case CUSTOMPASSINJECTIONPOINT_BEFORE_TRANSPARENT:
         case CUSTOMPASSINJECTIONPOINT_BEFORE_PRE_REFRACTION: return SAMPLE_TEXTURE2D_X_LOD(_ColorPyramidTexture, s_trilinear_clamp_sampler, uv * _RTHandleScaleHistory.xy, 0).rgb;
+        case CUSTOMPASSINJECTIONPOINT_AFTER_POST_PROCESS: return SAMPLE_TEXTURE2D_X_LOD(_AfterPostProcessColorBuffer, s_trilinear_clamp_sampler, uv * _RTHandleScaleHistory.xy, 0).rgb;
         default: return SampleCameraColor(uv, lod);
     }
 }
@@ -34,6 +39,7 @@ float3 CustomPassLoadCameraColor(uint2 pixelCoords, float lod)
         // there is no color pyramid yet for before transparent so we can't sample with mips.
         case CUSTOMPASSINJECTIONPOINT_BEFORE_TRANSPARENT:
         case CUSTOMPASSINJECTIONPOINT_BEFORE_PRE_REFRACTION: return LOAD_TEXTURE2D_X_LOD(_ColorPyramidTexture, pixelCoords, 0).rgb;
+        case CUSTOMPASSINJECTIONPOINT_AFTER_POST_PROCESS: return LOAD_TEXTURE2D_X_LOD(_AfterPostProcessColorBuffer, pixelCoords, 0).rgb;
         default: return LoadCameraColor(pixelCoords, lod);
     }
 }

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassVolume.cs

@@ -88,6 +88,8 @@ internal bool Execute(ScriptableRenderContext renderContext, CommandBuffer cmd,
                 return false;
 
             Shader.SetGlobalFloat(HDShaderIDs._CustomPassInjectionPoint, (float)injectionPoint);
+            if (injectionPoint == CustomPassInjectionPoint.AfterPostProcess)
+                Shader.SetGlobalTexture(HDShaderIDs._AfterPostProcessColorBuffer, targets.cameraColorBuffer);
 
             foreach (var pass in customPasses)
             {