Merge pull request Unity-Technologies#834 from JoJo2nd/v2-dyn-res

Chman · web-flow · commit 0b312e00ca51 · 2019-08-13T17:18:09.000+02:00
Added support for dynamic resolution
diff --git a/PostProcessing/Editor/PostProcessLayerEditor.cs b/PostProcessing/Editor/PostProcessLayerEditor.cs
@@ -38,6 +38,10 @@ sealed class PostProcessLayerEditor : BaseEditor<PostProcessLayer>
 
         Dictionary<PostProcessEvent, ReorderableList> m_CustomLists;
 
+        #if UNITY_2017_3_OR_NEWER
+        Camera m_TargetCameraComponent;
+        #endif
+
         static GUIContent[] s_AntialiasingMethodNames =
         {
             new GUIContent("No Anti-aliasing"),
@@ -75,6 +79,10 @@ void OnEnable()
 
             m_ShowToolkit = serializedObject.FindProperty("m_ShowToolkit");
             m_ShowCustomSorter = serializedObject.FindProperty("m_ShowCustomSorter");
+
+            #if UNITY_2017_3_OR_NEWER
+            m_TargetCameraComponent = m_Target.GetComponent<Camera>();
+            #endif
         }
 
         void OnDisable()
@@ -162,6 +170,10 @@ void DoAntialiasing()
                     if (RuntimeUtilities.isSinglePassStereoSelected)
                         EditorGUILayout.HelpBox("TAA requires Unity 2017.3+ for Single-pass stereo rendering support.", MessageType.Warning);
                     #endif
+                    #if UNITY_2017_3_OR_NEWER
+                    if (m_TargetCameraComponent != null && m_TargetCameraComponent.allowDynamicResolution)
+                        EditorGUILayout.HelpBox("TAA is not supported with Dynamic Resolution.", MessageType.Warning);
+                    #endif
 
                     EditorGUILayout.PropertyField(m_TaaJitterSpread);
                     EditorGUILayout.PropertyField(m_TaaStationaryBlending);
diff --git a/PostProcessing/Runtime/Effects/MotionBlur.cs b/PostProcessing/Runtime/Effects/MotionBlur.cs
@@ -58,6 +58,25 @@ public override DepthTextureMode GetCameraFlags()
             return DepthTextureMode.Depth | DepthTextureMode.MotionVectors;
         }
 
+        private void CreateTemporaryRT(PostProcessRenderContext context, int nameID, int width, int height, RenderTextureFormat RTFormat)
+        {
+            var cmd = context.command;
+#if UNITY_2017_2_OR_NEWER            
+            var rtDesc = context.GetDescriptor(0, RTFormat, RenderTextureReadWrite.Linear);
+            rtDesc.width = width;
+            rtDesc.height = height;
+#if UNITY_2019_1_OR_NEWER
+            cmd.GetTemporaryRT(nameID, rtDesc, FilterMode.Point);
+#elif UNITY_2017_3_OR_NEWER
+            cmd.GetTemporaryRT(nameID, rtDesc.width, rtDesc.height, rtDesc.depthBufferBits, FilterMode.Point, rtDesc.colorFormat, RenderTextureReadWrite.Linear, rtDesc.msaaSamples, rtDesc.enableRandomWrite, rtDesc.memoryless, context.camera.allowDynamicResolution);
+#else            
+            cmd.GetTemporaryRT(nameID, rtDesc.width, rtDesc.height, rtDesc.depthBufferBits, FilterMode.Point, rtDesc.colorFormat, RenderTextureReadWrite.Linear, rtDesc.msaaSamples, rtDesc.enableRandomWrite, rtDesc.memoryless);
+#endif
+#else
+            cmd.GetTemporaryRT(nameID, width, height, 0, FilterMode.Point, RTFormat, RenderTextureReadWrite.Linear);
+#endif
+        }
+
         public override void Render(PostProcessRenderContext context)
         {
             var cmd = context.command;
@@ -92,27 +111,23 @@ public override void Render(PostProcessRenderContext context)
             sheet.properties.SetFloat(ShaderIDs.RcpMaxBlurRadius, 1f / maxBlurPixels);
 
             int vbuffer = ShaderIDs.VelocityTex;
-            cmd.GetTemporaryRT(vbuffer, context.width, context.height, 0, FilterMode.Point,
-                packedRTFormat, RenderTextureReadWrite.Linear);
+            CreateTemporaryRT(context, vbuffer, context.width, context.height, packedRTFormat);
             cmd.BlitFullscreenTriangle(BuiltinRenderTextureType.None, vbuffer, sheet, (int)Pass.VelocitySetup);
 
             // Pass 2 - First TileMax filter (1/2 downsize)
             int tile2 = ShaderIDs.Tile2RT;
-            cmd.GetTemporaryRT(tile2, context.width / 2, context.height / 2, 0, FilterMode.Point,
-                vectorRTFormat, RenderTextureReadWrite.Linear);
+            CreateTemporaryRT(context, tile2, context.width / 2, context.height / 2, vectorRTFormat);
             cmd.BlitFullscreenTriangle(vbuffer, tile2, sheet, (int)Pass.TileMax1);
 
             // Pass 3 - Second TileMax filter (1/2 downsize)
             int tile4 = ShaderIDs.Tile4RT;
-            cmd.GetTemporaryRT(tile4, context.width / 4, context.height / 4, 0, FilterMode.Point,
-                vectorRTFormat, RenderTextureReadWrite.Linear);
+            CreateTemporaryRT(context, tile4, context.width / 4, context.height / 4, vectorRTFormat);
             cmd.BlitFullscreenTriangle(tile2, tile4, sheet, (int)Pass.TileMax2);
             cmd.ReleaseTemporaryRT(tile2);
 
             // Pass 4 - Third TileMax filter (1/2 downsize)
             int tile8 = ShaderIDs.Tile8RT;
-            cmd.GetTemporaryRT(tile8, context.width / 8, context.height / 8, 0, FilterMode.Point,
-                vectorRTFormat, RenderTextureReadWrite.Linear);
+            CreateTemporaryRT(context, tile8, context.width / 8, context.height / 8, vectorRTFormat);
             cmd.BlitFullscreenTriangle(tile4, tile8, sheet, (int)Pass.TileMax2);
             cmd.ReleaseTemporaryRT(tile4);
 
@@ -122,17 +137,13 @@ public override void Render(PostProcessRenderContext context)
             sheet.properties.SetFloat(ShaderIDs.TileMaxLoop, (int)(tileSize / 8f));
 
             int tile = ShaderIDs.TileVRT;
-            cmd.GetTemporaryRT(tile, context.width / tileSize, context.height / tileSize, 0,
-                FilterMode.Point, vectorRTFormat, RenderTextureReadWrite.Linear);
+            CreateTemporaryRT(context, tile, context.width / tileSize, context.height / tileSize, vectorRTFormat);
             cmd.BlitFullscreenTriangle(tile8, tile, sheet, (int)Pass.TileMaxV);
             cmd.ReleaseTemporaryRT(tile8);
 
             // Pass 6 - NeighborMax filter
             int neighborMax = ShaderIDs.NeighborMaxTex;
-            int neighborMaxWidth = context.width / tileSize;
-            int neighborMaxHeight = context.height / tileSize;
-            cmd.GetTemporaryRT(neighborMax, neighborMaxWidth, neighborMaxHeight, 0,
-                FilterMode.Point, vectorRTFormat, RenderTextureReadWrite.Linear);
+            CreateTemporaryRT(context, neighborMax, context.width / tileSize, context.height / tileSize, vectorRTFormat);
             cmd.BlitFullscreenTriangle(tile, neighborMax, sheet, (int)Pass.NeighborMax);
             cmd.ReleaseTemporaryRT(tile);
 
diff --git a/PostProcessing/Runtime/Effects/MultiScaleVO.cs b/PostProcessing/Runtime/Effects/MultiScaleVO.cs
@@ -40,8 +40,9 @@ enum Pass
         readonly float[] m_InvThicknessTable = new float[12];
         readonly float[] m_SampleWeightTable = new float[12];
 
-        readonly int[] m_Widths = new int[7];
-        readonly int[] m_Heights = new int[7];
+        // Scaled dimensions used with dynamic resolution
+        readonly int[] m_ScaledWidths = new int[7];
+        readonly int[] m_ScaledHeights = new int[7];
 
         AmbientOcclusion m_Settings;
         PropertySheet m_PropertySheet;
@@ -79,8 +80,8 @@ void Alloc(CommandBuffer cmd, int id, MipLevel size, RenderTextureFormat format,
             int sizeId = (int)size;
             cmd.GetTemporaryRT(id, new RenderTextureDescriptor
             {
-                width = m_Widths[sizeId],
-                height = m_Heights[sizeId],
+                width = m_ScaledWidths[sizeId],
+                height = m_ScaledHeights[sizeId],
                 colorFormat = format,
                 depthBufferBits = 0,
                 volumeDepth = 1,
@@ -97,8 +98,8 @@ void AllocArray(CommandBuffer cmd, int id, MipLevel size, RenderTextureFormat fo
             int sizeId = (int)size;
             cmd.GetTemporaryRT(id, new RenderTextureDescriptor
             {
-                width = m_Widths[sizeId],
-                height = m_Heights[sizeId],
+                width = m_ScaledWidths[sizeId],
+                height = m_ScaledHeights[sizeId],
                 colorFormat = format,
                 depthBufferBits = 0,
                 volumeDepth = 16,
@@ -135,26 +136,31 @@ float CalculateTanHalfFovHeight(Camera camera)
 
         Vector2 GetSize(MipLevel mip)
         {
-            return new Vector2(m_Widths[(int)mip], m_Heights[(int)mip]);
+            return new Vector2(m_ScaledWidths[(int)mip], m_ScaledHeights[(int)mip]);
         }
 
         Vector3 GetSizeArray(MipLevel mip)
         {
-            return new Vector3(m_Widths[(int)mip], m_Heights[(int)mip], 16);
+            return new Vector3(m_ScaledWidths[(int)mip], m_ScaledHeights[(int)mip], 16);
         }
 
         public void GenerateAOMap(CommandBuffer cmd, Camera camera, RenderTargetIdentifier destination, RenderTargetIdentifier? depthMap, bool invert, bool isMSAA)
         {
             // Base size
-            m_Widths[0] = camera.pixelWidth * (RuntimeUtilities.isSinglePassStereoEnabled ? 2 : 1);
-            m_Heights[0] = camera.pixelHeight;
-
+#if UNITY_2017_3_OR_NEWER
+            m_ScaledWidths[0] = camera.scaledPixelWidth * (RuntimeUtilities.isSinglePassStereoEnabled ? 2 : 1);
+            m_ScaledHeights[0] = camera.scaledPixelHeight;
+#else
+            m_ScaledWidths[0] = camera.pixelWidth * (RuntimeUtilities.isSinglePassStereoEnabled ? 2 : 1);
+            m_ScaledHeights[0] = camera.pixelHeight;       
+#endif
+            
             // L1 -> L6 sizes
             for (int i = 1; i < 7; i++)
             {
                 int div = 1 << i;
-                m_Widths[i]  = (m_Widths[0]  + (div - 1)) / div;
-                m_Heights[i] = (m_Heights[0] + (div - 1)) / div;
+                m_ScaledWidths[i]  = (m_ScaledWidths[0]  + (div - 1)) / div;
+                m_ScaledHeights[i] = (m_ScaledHeights[0] + (div - 1)) / div;
             }
 
             // Allocate temporary textures
@@ -266,7 +272,7 @@ void PushDownsampleCommands(CommandBuffer cmd, Camera camera, RenderTargetIdenti
             cmd.SetComputeVectorParam(cs, "ZBufferParams", CalculateZBufferParams(camera));
             cmd.SetComputeTextureParam(cs, kernel, "Depth", depthMapId);
 
-            cmd.DispatchCompute(cs, kernel, m_Widths[(int)MipLevel.L4], m_Heights[(int)MipLevel.L4], 1);
+            cmd.DispatchCompute(cs, kernel, m_ScaledWidths[(int)MipLevel.L4], m_ScaledHeights[(int)MipLevel.L4], 1);
 
             if (needDepthMapRelease)
                 Release(cmd, ShaderIDs.DepthCopy);
@@ -281,7 +287,7 @@ void PushDownsampleCommands(CommandBuffer cmd, Camera camera, RenderTargetIdenti
             cmd.SetComputeTextureParam(cs, kernel, "DS8xAtlas", ShaderIDs.TiledDepth3);
             cmd.SetComputeTextureParam(cs, kernel, "DS16xAtlas", ShaderIDs.TiledDepth4);
 
-            cmd.DispatchCompute(cs, kernel, m_Widths[(int)MipLevel.L6], m_Heights[(int)MipLevel.L6], 1);
+            cmd.DispatchCompute(cs, kernel, m_ScaledWidths[(int)MipLevel.L6], m_ScaledHeights[(int)MipLevel.L6], 1);
         }
 
         void PushRenderCommands(CommandBuffer cmd, int source, int destination, Vector3 sourceSize, float tanHalfFovH, bool isMSAA)
@@ -451,15 +457,22 @@ void PreparePropertySheet(PostProcessRenderContext context)
 
         void CheckAOTexture(PostProcessRenderContext context)
         {
-            if (m_AmbientOnlyAO == null || !m_AmbientOnlyAO.IsCreated() || m_AmbientOnlyAO.width != context.width || m_AmbientOnlyAO.height != context.height)
+            bool AOUpdateNeeded = m_AmbientOnlyAO == null || !m_AmbientOnlyAO.IsCreated() || m_AmbientOnlyAO.width != context.width || m_AmbientOnlyAO.height != context.height;
+#if UNITY_2017_3_OR_NEWER                
+            AOUpdateNeeded = AOUpdateNeeded || m_AmbientOnlyAO.useDynamicScale != context.camera.allowDynamicResolution;
+#endif                  
+            if (AOUpdateNeeded)
             {
                 RuntimeUtilities.Destroy(m_AmbientOnlyAO);
 
                 m_AmbientOnlyAO = new RenderTexture(context.width, context.height, 0, RenderTextureFormat.R8, RenderTextureReadWrite.Linear)
                 {
                     hideFlags = HideFlags.DontSave,
                     filterMode = FilterMode.Point,
-                    enableRandomWrite = true
+                    enableRandomWrite = true,
+#if UNITY_2017_3_OR_NEWER
+                    useDynamicScale = context.camera.allowDynamicResolution
+#endif
                 };
                 m_AmbientOnlyAO.Create();
             }
diff --git a/PostProcessing/Runtime/Effects/SubpixelMorphologicalAntialiasing.cs b/PostProcessing/Runtime/Effects/SubpixelMorphologicalAntialiasing.cs
@@ -63,8 +63,13 @@ internal void Render(PostProcessRenderContext context)
             var cmd = context.command;
             cmd.BeginSample("SubpixelMorphologicalAntialiasing");
 
-            cmd.GetTemporaryRT(ShaderIDs.SMAA_Flip, context.width, context.height, 0, FilterMode.Bilinear, context.sourceFormat, RenderTextureReadWrite.Linear);
-            cmd.GetTemporaryRT(ShaderIDs.SMAA_Flop, context.width, context.height, 0, FilterMode.Bilinear, context.sourceFormat, RenderTextureReadWrite.Linear);
+#if UNITY_2017_3_OR_NEWER
+            cmd.GetTemporaryRT(ShaderIDs.SMAA_Flip, context.width, context.height, 0, FilterMode.Bilinear, context.sourceFormat, RenderTextureReadWrite.Linear, 1, false, RenderTextureMemoryless.None, context.camera.allowDynamicResolution);
+            cmd.GetTemporaryRT(ShaderIDs.SMAA_Flop, context.width, context.height, 0, FilterMode.Bilinear, context.sourceFormat, RenderTextureReadWrite.Linear, 1, false, RenderTextureMemoryless.None, context.camera.allowDynamicResolution);
+#else
+            cmd.GetTemporaryRT(ShaderIDs.SMAA_Flip, context.width, context.height, 0, FilterMode.Bilinear, context.sourceFormat, RenderTextureReadWrite.Linear, 1, false);
+            cmd.GetTemporaryRT(ShaderIDs.SMAA_Flop, context.width, context.height, 0, FilterMode.Bilinear, context.sourceFormat, RenderTextureReadWrite.Linear, 1, false);
+#endif            
 
             cmd.BlitFullscreenTriangle(context.source, ShaderIDs.SMAA_Flip, sheet, (int)Pass.EdgeDetection + (int)quality, true);
             cmd.BlitFullscreenTriangle(ShaderIDs.SMAA_Flip, ShaderIDs.SMAA_Flop, sheet, (int)Pass.BlendWeights + (int)quality);
diff --git a/PostProcessing/Runtime/PostProcessLayer.cs b/PostProcessing/Runtime/PostProcessLayer.cs
@@ -237,14 +237,20 @@ void InitLegacy()
             m_CurrentContext = new PostProcessRenderContext();
         }
 
+#if UNITY_2019_1_OR_NEWER
+        bool DynamicResolutionAllowsFinalBlitToCameraTarget()
+        { 
+            return (!m_Camera.allowDynamicResolution || (ScalableBufferManager.heightScaleFactor == 1.0 && ScalableBufferManager.widthScaleFactor == 1.0));
+        }
+#endif
 
 #if UNITY_2019_1_OR_NEWER
         // We always use a CommandBuffer to blit to the final render target
         // OnRenderImage is used only to avoid the automatic blit from the RenderTexture of Camera.forceIntoRenderTexture to the actual target
         [ImageEffectUsesCommandBuffer]
         void OnRenderImage(RenderTexture src, RenderTexture dst)
         {
-            if (finalBlitToCameraTarget)
+            if (finalBlitToCameraTarget && DynamicResolutionAllowsFinalBlitToCameraTarget())
                 RenderTexture.active = dst; // silence warning
             else
                 Graphics.Blit(src, dst);
@@ -607,7 +613,7 @@ void BuildCommandBuffers()
             context.destination = cameraTarget;
 
 #if UNITY_2019_1_OR_NEWER
-            if (finalBlitToCameraTarget && !RuntimeUtilities.scriptableRenderPipelineActive)
+            if (finalBlitToCameraTarget && !RuntimeUtilities.scriptableRenderPipelineActive && DynamicResolutionAllowsFinalBlitToCameraTarget())
             {
                 if (m_Camera.targetTexture)
                 {
diff --git a/PostProcessing/Runtime/PostProcessRenderContext.cs b/PostProcessing/Runtime/PostProcessRenderContext.cs
@@ -322,7 +322,14 @@ public void PushDebugOverlay(CommandBuffer cmd, RenderTargetIdentifier source, P
         // size usages explicit
 #if UNITY_2017_2_OR_NEWER
         RenderTextureDescriptor m_sourceDescriptor;
-        RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
+        /// <summary>
+        /// Returns a modified copy the RenderTextureDescriptor used by the context object. 
+        /// </summary>
+        /// <param name="depthBufferBits">The number of bits to use for the depth buffer</param>
+        /// <param name="colorFormat">The render texture format</param>
+        /// <param name="readWrite">The color space conversion mode</param>
+        /// <returns>A RenderTextureDescriptor object</returns>
+        public RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
         {
             var modifiedDesc = new RenderTextureDescriptor(m_sourceDescriptor.width, m_sourceDescriptor.height,
                                                                                 m_sourceDescriptor.colorFormat, depthBufferBits);
@@ -337,6 +344,11 @@ RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureForm
             modifiedDesc.enableRandomWrite = m_sourceDescriptor.enableRandomWrite;
             modifiedDesc.shadowSamplingMode = m_sourceDescriptor.shadowSamplingMode;
 
+#if UNITY_2019_1_OR_NEWER     
+            if (m_Camera.allowDynamicResolution)           
+                modifiedDesc.useDynamicScale = true;
+#endif
+
             if (colorFormat != RenderTextureFormat.Default)
                 modifiedDesc.colorFormat = colorFormat;
 
@@ -380,8 +392,14 @@ public void GetScreenSpaceTemporaryRT(CommandBuffer cmd, int nameID,
             //intermediates in VR are unchanged
             if (stereoActive && desc.dimension == Rendering.TextureDimension.Tex2DArray)
                desc.dimension = Rendering.TextureDimension.Tex2D;
-          
+            
+#if UNITY_2019_1_OR_NEWER
             cmd.GetTemporaryRT(nameID, desc, filter);
+#elif UNITY_2017_3_OR_NEWER
+            cmd.GetTemporaryRT(nameID, desc.width, desc.height, desc.depthBufferBits, filter, desc.colorFormat, readWrite, desc.msaaSamples, desc.enableRandomWrite, desc.memoryless, m_Camera.allowDynamicResolution);
+#else
+            cmd.GetTemporaryRT(nameID, desc.width, desc.height, desc.depthBufferBits, filter, desc.colorFormat, readWrite, desc.msaaSamples, desc.enableRandomWrite, desc.memoryless);
+#endif
 #else
             int actualWidth = width;
             int actualHeight = height;
