Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp

Author: PaulDemeulenaere

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

@@ -49,6 +49,7 @@ The version number for this package has increased due to a version update of a r
 - Added an option to change the visibilty of the Volumes Gizmos (Solid, Wireframe, Everything), available at Preferences > Core Render Pipeline
 - Added class for drawing shadow cascades `UnityEditor.Rendering.ShadowCascadeGUI.DrawShadowCascades`.
 - Added UNITY_PREV_MATRIX_M and UNITY_PREV_MATRIX_I_M shader macros to support instanced motion vector rendering
+- Added new API to customize the rtHandleProperties of a particular RTHandle. This is a temporary work around to assist with viewport setup of Custom post process when dealing with DLSS or TAAU
 
 ### Fixed
 - Help boxes with fix buttons do not crop the label.

com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs

@@ -19,6 +19,29 @@ public class RTHandle
         internal bool m_EnableHWDynamicScale = false;
         internal string m_Name;
 
+        internal bool m_UseCustomHandleScales = false;
+        internal RTHandleProperties m_CustomHandleProperties;
+
+        /// <summary>
+        /// By default, rtHandleProperties gets the global state of scalers against the global reference mode.
+        /// This method lets the current RTHandle use a local custom RTHandleProperties. This function is being used
+        /// by scalers such as TAAU and DLSS, which require to have a different resolution for color (independent of the RTHandleSystem).
+        /// </summary>
+        /// <param name="properties">Properties to set.</param>
+        public void SetCustomHandleProperties(in RTHandleProperties properties)
+        {
+            m_UseCustomHandleScales = true;
+            m_CustomHandleProperties = properties;
+        }
+
+        /// <summary>
+        /// Method that clears any custom handle property being set.
+        /// </summary>
+        public void ClearCustomHandleProperties()
+        {
+            m_UseCustomHandleScales = false;
+        }
+
         /// <summary>
         /// Scale factor applied to the RTHandle reference size.
         /// </summary>
@@ -34,9 +57,9 @@ public class RTHandle
         /// </summary>
         public Vector2Int referenceSize { get; internal set; }
         /// <summary>
-        /// Current properties of the RTHandle System
+        /// Current properties of the RTHandle System. If a custom property has been set through SetCustomHandleProperties method, it will be used that one instead.
         /// </summary>
-        public RTHandleProperties rtHandleProperties { get { return m_Owner.rtHandleProperties; } }
+        public RTHandleProperties rtHandleProperties { get { return m_UseCustomHandleScales ? m_CustomHandleProperties : m_Owner.rtHandleProperties; } }
         /// <summary>
         /// RenderTexture associated with the RTHandle
         /// </summary>

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

@@ -390,6 +390,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed wrong ordering in FrameSettings (Normalize Reflection Probes)
 - Fixed ThreadMapDetail to saturate AO & smoothness strength inputs to prevent out-of-bounds values set by users (1357740)
 - Allow negative wind speed parameter.
+- Viewport and scaling of Custom post process when TAAU or DLSS are enabled (case 1352407).
 
 ### Changed
 - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard

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

@@ -1364,6 +1364,8 @@ class CustomPostProcessData
             public TextureHandle motionVecTexture;
             public HDCamera hdCamera;
             public CustomPostProcessVolumeComponent customPostProcess;
+            public Vector4 postProcessScales;
+            public Vector2Int postProcessViewportSize;
         }
 
         bool DoCustomPostProcess(RenderGraph renderGraph, HDCamera hdCamera, ref TextureHandle source, TextureHandle depthBuffer, TextureHandle normalBuffer, TextureHandle motionVectors, List<string> postProcessList)
@@ -1398,19 +1400,39 @@ bool DoCustomPostProcess(RenderGraph renderGraph, HDCamera hdCamera, ref Texture
                                 passData.motionVecTexture = builder.ReadTexture(motionVectors);
 
                                 passData.source = builder.ReadTexture(source);
-                                passData.destination = builder.UseColorBuffer(renderGraph.CreateTexture(new TextureDesc(Vector2.one, true, true)
+                                passData.destination = builder.UseColorBuffer(renderGraph.CreateTexture(new TextureDesc(Vector2.one, IsDynamicResUpscaleTargetEnabled(), true)
                                 { colorFormat = GetPostprocessTextureFormat(), enableRandomWrite = true, name = "CustomPostProcesDestination" }), 0);
                                 passData.hdCamera = hdCamera;
                                 passData.customPostProcess = customPP;
+                                passData.postProcessScales = new Vector4(hdCamera.postProcessRTScales.x, hdCamera.postProcessRTScales.y, hdCamera.postProcessRTScalesHistory.x, hdCamera.postProcessRTScalesHistory.y);
+                                passData.postProcessViewportSize = postProcessViewportSize;
                                 builder.SetRenderFunc(
                                     (CustomPostProcessData data, RenderGraphContext ctx) =>
                                     {
+                                        var srcRt = (RTHandle)data.source;
+                                        var dstRt = (RTHandle)data.destination;
+
+                                        // HACK FIX: for custom post process, we want the user to transparently be able to use color target regardless of the scaling occured. For example, if the user uses any of the HDUtil blit methods
+                                        // which require the rtHandleProperties to set the viewport and sample scales.
+                                        // In the case of DLSS and TAAU, the post process viewport and size for the color target have changed, thus we override them here.
+                                        // When these upscalers arent set, behaviour is still the same (since the post process scale is the same as the global rt handle scale). So for simplicity, we always take this code path for custom post process color.
+                                        var newProps = srcRt.rtHandleProperties;
+                                        newProps.rtHandleScale = data.postProcessScales;
+                                        newProps.currentRenderTargetSize = data.postProcessViewportSize;
+                                        newProps.previousRenderTargetSize = data.postProcessViewportSize;
+                                        newProps.currentViewportSize = data.postProcessViewportSize;
+                                        srcRt.SetCustomHandleProperties(newProps);
+                                        dstRt.SetCustomHandleProperties(newProps);
+
                                         // Temporary: see comment above
                                         ctx.cmd.SetGlobalTexture(HDShaderIDs._CameraDepthTexture, data.depthBuffer);
                                         ctx.cmd.SetGlobalTexture(HDShaderIDs._NormalBufferTexture, data.normalBuffer);
                                         ctx.cmd.SetGlobalTexture(HDShaderIDs._CameraMotionVectorsTexture, data.motionVecTexture);
 
                                         data.customPostProcess.Render(ctx.cmd, data.hdCamera, data.source, data.destination);
+
+                                        srcRt.ClearCustomHandleProperties();
+                                        dstRt.ClearCustomHandleProperties();
                                     });
 
                                 customPostProcessExecuted = true;

com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs

@@ -537,7 +537,7 @@ internal void SetupAmbientProbe(HDCamera hdCamera)
             RenderSettings.ambientIntensity = 1.0f;
             RenderSettings.ambientMode = AmbientMode.Skybox; // Force skybox for our HDRI
             RenderSettings.reflectionIntensity = 1.0f;
-            RenderSettings.customReflection = null;
+            RenderSettings.customReflectionTexture = null;
         }
 
         void BlitCubemap(CommandBuffer cmd, Cubemap source, RenderTexture dest)
@@ -1254,7 +1254,7 @@ void OnBakeStarted()
             RenderSettings.ambientIntensity = 1.0f;
             RenderSettings.ambientMode = AmbientMode.Skybox; // Force skybox for our HDRI
             RenderSettings.reflectionIntensity = 1.0f;
-            RenderSettings.customReflection = null;
+            RenderSettings.customReflectionTexture = null;
 
             DynamicGI.UpdateEnvironment();
         }

com.unity.visualeffectgraph/CHANGELOG.md

@@ -101,6 +101,8 @@ The version number for this package has increased due to a version update of a r
 - Exposed Parameter placement can be moved after sanitize
 - Fix rendering artifacts on some mobile devices [Case 1149057](https://issuetracker.unity3d.com/product/unity/issues/guid/1149057/)
 - Fix compilation failure on OpenGLES [Case 1348666](https://issuetracker.unity3d.com/product/unity/issues/guid/1348666/)
+- Don't open an empty VFX Graph Editor when assigning a VFX Asset to a Visual Effect GameObject from the inspector [Case 1347399](https://issuetracker.unity3d.com/product/unity/issues/guid/1347399/)
+- Visual Effect inspector input fields don't lose focus anymore while typing (Random seed)
 
 ## [11.0.0] - 2020-10-21
 ### Added

com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs

@@ -801,7 +801,7 @@ public override void OnInspectorGUI()
             EditorGUI.indentLevel = 0;
             if (serializedObject.ApplyModifiedProperties())
             {
-                var window = EditorWindow.GetWindow<VFXViewWindow>();
+                var window = WindowLayout.FindEditorWindowOfType(typeof(VFXViewWindow)) as VFXViewWindow;
                 if (window != null)
                     window.OnVisualEffectComponentChanged(targets.Cast<VisualEffect>());
             }