Merge remote-tracking branch 'origin/URP-10.2.2'

Author: yahiaetman

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.1.0] - 2021-01-23
 ### Added
 - Added a Scene Transparent Depth PrePass.
+- Added support for URP's ScriptableRenderPassInput to pick which scene textures are needed for each effect. 
 
 ### Changed
 - Gradient Fog can now be used before or after the transparent pass.
@@ -16,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed scene shifting on the screen to the left with the Glitch effect.
 - Removed some visual artifacts from Edge Detection by making the depth threshold relative to the center pixel depth.
 
+### Removed
+- Removed the scene normal texture renderer feature since it is no longer needed with URP 10.
+
 ## [1.0.0] - 2020-09-17
 ### Added
 - Added the main functionality for custom post-processing as renderer future for URP.

README.md

@@ -29,16 +29,15 @@ Other custom effects in samples but not used in screenshots:
 
 ## Compatibility
 
-* Unity 2020.1
-* URP 8.2.0
+* Unity 2020.2
+* URP 10.2.2
 
 ## Features
 
 * Conveniently add custom post processing effects à la [PPSv2](https://github.com/Unity-Technologies/PostProcessing) and [HDRP's Custom Post Process](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@8.2/manual/Custom-Post-Process.html).
 * Reorder effects from the editor like HDRP's [Custom Post Process Orders Settings](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@8.2/manual/Custom-Post-Process.html#effect-ordering).
 * Use legacy `Image Effect Shaders` and `Unlit Shader Graphs` if you wish. It worked out of the box; No work was done by me.
 * Use it with `Camera Stacking`.
-* Use the `SceneNormals` feature (adapted from [Outline Study](https://github.com/chrisloop/outlinestudy) by [Christopher Sims](https://github.com/chrisloop)) to grab the scene normals onto a texture.
 
 ### Features that are almost untested:
 * It should be compatible with **MultiPass XR** but it is tested with **Mock HMD Loader** only so I can't guarantee that it works on an actual headset.
@@ -47,7 +46,6 @@ Other custom effects in samples but not used in screenshots:
 ## Known Issues
 
 * It failed with **Single-Pass Instanced** on **Mock HMD Loader**.
-* The `SceneNormals` renderer feature uses the override material in the drawing settings so it doesn't copy the original materials' parameters (e.g. normal maps and alpha clipping) and doesn't respect custom vertex shaders. This should be solved in URP 10.0 with the release of the `DepthNormalsPass` made for the SSAO feature.
 
 ## Features I hope to implement
 
@@ -58,7 +56,11 @@ Other custom effects in samples but not used in screenshots:
 ## How To Install
 
 Follow the instructions from the Unity manual on [Installing from a Git URL](https://docs.unity3d.com/Manual/upm-ui-giturl.html) and insert the url:
+<<<<<<< HEAD
 > https://github.com/yahiaetman/URPCustomPostProcessingStack.git#v1.1.0
+=======
+> https://github.com/yahiaetman/URPCustomPostProcessingStack.git#URP-10.2.2
+>>>>>>> origin/URP-10.2.2
 
 The package also contains 8 example effects included as a sample.
 
@@ -237,7 +239,8 @@ We didn't explain some stuff here but you can see more in the samples:
 * Create temporary render targets inside the renderer (see [StreakEffect.cs](Samples~/Examples/Scripts/PostProcessing/StreakEffect.cs)).
 * Create persistent render targets inside the renderer (see [AfterImageEffect.cs](Samples~/Examples/Scripts/PostProcessing/AfterImageEffect.cs)).
 * Use a shader graph `Unlit shader` to create a post processing effect (see [GlitchEffect.cs](Samples~/Examples/Scripts/PostProcessing/GlitchEffect.cs)).
-* Use a renderer at multiple injection points (see [GradientFogEffect.cs](Samples~/Examples/Scripts/PostProcessing/GradientFogEffect.cs) and [GradientFog.shader](Samples~/Examples/Resources/Shaders/PostProcessing/GradientFog.shader)). 
+* Use a renderer at multiple injection points (see [GradientFogEffect.cs](Samples~/Examples/Scripts/PostProcessing/GradientFogEffect.cs) and [GradientFog.shader](Samples~/Examples/Resources/Shaders/PostProcessing/GradientFog.shader)).
+* Requesting Depth and/or Normal Textures for a post processing effect (see [GradientFogEffect.cs](Samples~/Examples/Scripts/PostProcessing/GradientFogEffect.cs) and [EdgeDetectionEffect.cs](Samples~/Examples/Scripts/PostProcessing/EdgeDetectionEffect.cs))
 
 ## Issues & Pull Requests
 

Runtime/RenderFeatures/CustomPostProcess.cs

@@ -267,18 +267,25 @@ public bool PrepareRenderers(ref RenderingData renderingData){
             // See if current camera is a scene view camera to skip renderers with "visibleInSceneView" = false.
             bool isSceneView = renderingData.cameraData.cameraType == CameraType.SceneView;
 
+            // Here, we will collect the inputs needed by all the custom post processing effects
+            ScriptableRenderPassInput passInput = ScriptableRenderPassInput.None;
+
             // Collect the active renderers
             m_ActivePostProcessRenderers.Clear();
             for(int index = 0; index < m_PostProcessRenderers.Count; index++){
                 var ppRenderer = m_PostProcessRenderers[index];
                 // Skips current renderer if "visibleInSceneView" = false and the current camera is a scene view camera. 
                 if(isSceneView && !ppRenderer.visibleInSceneView) continue;
-                // Setup the camera for the renderer and if it will render anything, add to active renderers
+                // Setup the camera for the renderer and if it will render anything, add to active renderers and get its required inputs
                 if(ppRenderer.Setup(ref renderingData, injectionPoint)){
                     m_ActivePostProcessRenderers.Add(index);
+                    passInput |= ppRenderer.input;
                 }
             }
 
+            // Configure the pass to tell the renderer what inputs we need
+            ConfigureInput(passInput);
+
             // return if no renderers are active
             return m_ActivePostProcessRenderers.Count != 0;
         } 

Runtime/RenderFeatures/CustomPostProcessRenderer.cs

@@ -28,6 +28,11 @@ public abstract class CustomPostProcessRenderer : IDisposable
         /// </summary>
         public virtual bool visibleInSceneView => true;
 
+        /// <summary>
+        /// Specifies the input needed by this custom post process. Default is Color only.
+        /// </summary>
+        public virtual ScriptableRenderPassInput input => ScriptableRenderPassInput.Color;
+
         /// <summary>
         /// Whether the function initialize has already been called
         /// </summary>

Runtime/RenderFeatures/SceneNormals.cs

@@ -102,8 +102,6 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
 
                 ref CameraData cameraData = ref renderingData.cameraData;
                 Camera camera = cameraData.camera;
-                if (cameraData.isStereoEnabled)
-                    context.StartMultiEye(camera);
 
                 m_FilteringSettings.layerMask = camera.cullingMask;
 

Runtime/RenderFeatures/SceneNormals.cs.meta

@@ -2,8 +2,7 @@
 {
     HLSLINCLUDE
     #include "Packages/com.yetman.render-pipelines.universal.postprocess/ShaderLibrary/Core.hlsl"
-    // In URP 10, this should be replaced by the same file from URP's ShaderLibrary
-    #include "Packages/com.yetman.render-pipelines.universal.postprocess/ShaderLibrary/DeclareNormalsTexture.hlsl"
+    #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DeclareNormalsTexture.hlsl"
     #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DeclareDepthTexture.hlsl"
 
     TEXTURE2D_X(_MainTex);

Runtime/RenderFeatures/SceneTransparentDepth.cs

@@ -46,6 +46,9 @@ static class ShaderIDs {
 
         // By default, the effect is visible in the scene view, but we can change that here.
         public override bool visibleInSceneView => true;
+        
+        // We need Color, Depth and Normal textures to apply edge detection.
+        public override ScriptableRenderPassInput input => ScriptableRenderPassInput.Color | ScriptableRenderPassInput.Depth | ScriptableRenderPassInput.Normal;
 
         // Initialized is called only once before the first render call
         // so we use it to create our material

Samples~/Examples/Resources/Shaders/PostProcessing/EdgeDetection.shader

@@ -52,6 +52,9 @@ static class ShaderIDs {
         // By default, the effect is visible in the scene view, but we can change that here.
         public override bool visibleInSceneView => true;
 
+        // We need depth to compute the pixel distance from the camera which is required to calculate the fog
+        public override ScriptableRenderPassInput input => ScriptableRenderPassInput.Color | ScriptableRenderPassInput.Depth;
+
         // Initialized is called only once before the first render call
         // so we use it to create our material
         public override void Initialize()