[Port] [6000.2] Move the CompositionMode.BeforeColorPyramidAfterClouds to happen after water

Author: svc-reach-platform-support

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

@@ -1672,9 +1672,6 @@ TextureHandle RenderTransparency(RenderGraph renderGraph,
             // Combine volumetric clouds with prerefraction transparents
             m_VolumetricClouds.CombineVolumetricClouds(renderGraph, hdCamera, colorBuffer, prepassOutput.resolvedDepthBuffer, transparentPrepass, ref opticalFogTransmittance);
 
-            // Compose the lines if the user wants lines in the color pyramid (refraction), but after clouds.
-            ComposeLines(renderGraph, hdCamera, colorBuffer, prepassOutput.resolvedDepthBuffer, prepassOutput.motionVectorsBuffer, (int)LineRendering.CompositionMode.BeforeColorPyramidAfterClouds);
-
             var preRefractionList = renderGraph.CreateRendererList(PrepareForwardTransparentRendererList(cullingResults, hdCamera, true));
             var refractionList = renderGraph.CreateRendererList(PrepareForwardTransparentRendererList(cullingResults, hdCamera, false));
 
@@ -1686,6 +1683,9 @@ TextureHandle RenderTransparency(RenderGraph renderGraph,
             // If required, render the water debug view
             m_WaterSystem.RenderWaterDebug(renderGraph, hdCamera, colorBuffer, prepassOutput.depthBuffer, transparentPrepass.waterGBuffer);
 
+            // Compose the lines if the user wants lines in the color pyramid (refraction), but after clouds.
+            ComposeLines(renderGraph, hdCamera, colorBuffer, prepassOutput.resolvedDepthBuffer, prepassOutput.motionVectorsBuffer, (int)LineRendering.CompositionMode.BeforeColorPyramidAfterClouds);
+
             bool ssmsEnabled = Fog.IsMultipleScatteringEnabled(hdCamera, out float fogMultipleScatteringIntensity);
             if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.Refraction) || hdCamera.IsSSREnabled() || hdCamera.IsSSREnabled(true) || hdCamera.IsSSGIEnabled() || ssmsEnabled)
             {

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/LineRendering/Core/LineRendering.cs

@@ -23,7 +23,7 @@ public enum CompositionMode
         {
             /// <summary>Composition will occur before the color pyramid is generated.</summary>
             BeforeColorPyramid = 0,
-            /// <summary>Composition will occur before the color pyramid is generated but after clouds are composited.</summary>
+            /// <summary>Composition will occur before the color pyramid is generated but after clouds and water are composited.</summary>
             BeforeColorPyramidAfterClouds = 3,
             /// <summary>Composition will occur after temporal anti-aliasing.</summary>
             AfterTemporalAntialiasing = 1,