From df00139c7399fdb0fa101ff7090b7ba0d6402765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Leli=C3=A8vre?= <antoinel@unity3d.com>
Date: Tue, 13 Oct 2020 12:45:59 +0200
Subject: [PATCH 1/2] Fixed render queue migration issue when moving from 8.x
 to 10.x

---
 .../ShaderGraph/HDLitSubTarget.Migration.cs   |  2 +-
 .../ShaderGraph/HDUnlitSubTarget.Migration.cs |  2 +-
 .../Runtime/RenderPipeline/HDRenderQueue.cs   | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs
index d398ed5f230..3d3cd25e904 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs
@@ -106,7 +106,7 @@ void UpgradeHDLitMasterNode(HDLitMasterNode1 hdLitMasterNode, out Dictionary<Blo
             // Set data
             systemData.surfaceType = (SurfaceType)hdLitMasterNode.m_SurfaceType;
             systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)hdLitMasterNode.m_AlphaMode);
-            systemData.renderingPass = hdLitMasterNode.m_RenderingPass;
+            systemData.renderingPass = HDRenderQueue.MigrateRenderQueueToHDRP10(hdLitMasterNode.m_RenderingPass);
             // Patch rendering pass in case the master node had an old configuration
             if (systemData.renderingPass == HDRenderQueue.RenderQueueType.Background)
                 systemData.renderingPass = HDRenderQueue.RenderQueueType.Opaque;
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSubTarget.Migration.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSubTarget.Migration.cs
index 6ca71bc7bb1..bb48e5f24f8 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSubTarget.Migration.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSubTarget.Migration.cs
@@ -67,7 +67,7 @@ void UpgradeHDUnlitMasterNode(HDUnlitMasterNode1 hdUnlitMasterNode, out Dictiona
             // Set data
             systemData.surfaceType = (SurfaceType)hdUnlitMasterNode.m_SurfaceType;
             systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)hdUnlitMasterNode.m_AlphaMode);
-            systemData.renderingPass = hdUnlitMasterNode.m_RenderingPass;
+            systemData.renderingPass = HDRenderQueue.MigrateRenderQueueToHDRP10(hdUnlitMasterNode.m_RenderingPass);
             // Patch rendering pass in case the master node had an old configuration
             if (systemData.renderingPass == HDRenderQueue.RenderQueueType.Background)
                 systemData.renderingPass = HDRenderQueue.RenderQueueType.Opaque;
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderQueue.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderQueue.cs
index 75031260716..ecdb412efa3 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderQueue.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderQueue.cs
@@ -66,6 +66,25 @@ public enum RenderQueueType
             Unknown
         }
 
+        internal static RenderQueueType MigrateRenderQueueToHDRP10(RenderQueueType renderQueue)
+        {
+            switch((int)renderQueue)
+            {
+                case 0: return RenderQueueType.Background; // Background
+                case 1: return RenderQueueType.Opaque; // Opaque
+                case 2: return RenderQueueType.AfterPostProcessOpaque; // AfterPostProcessOpaque
+                case 3: return RenderQueueType.Opaque; // RaytracingOpaque
+                case 4: return RenderQueueType.PreRefraction; // PreRefraction
+                case 5: return RenderQueueType.Transparent; // Transparent
+                case 6: return RenderQueueType.LowTransparent; // LowTransparent
+                case 7: return RenderQueueType.AfterPostprocessTransparent; // AfterPostprocessTransparent
+                case 8: return RenderQueueType.Transparent; // RaytracingTransparent
+                case 9: return RenderQueueType.Overlay; // Overlay
+                default:
+                case 10: return RenderQueueType.Unknown; // Unknown
+            }
+        }
+
         public static readonly RenderQueueRange k_RenderQueue_OpaqueNoAlphaTest = new RenderQueueRange { lowerBound = (int)Priority.Background, upperBound = (int)Priority.OpaqueAlphaTest - 1 };
         public static readonly RenderQueueRange k_RenderQueue_OpaqueAlphaTest = new RenderQueueRange { lowerBound = (int)Priority.OpaqueAlphaTest, upperBound = (int)Priority.OpaqueLast };
         public static readonly RenderQueueRange k_RenderQueue_OpaqueDecalAndAlphaTest = new RenderQueueRange { lowerBound = (int)Priority.OpaqueDecal, upperBound = (int)Priority.OpaqueLast };

From b6a9e7fd590670e68249f6776d1410cac119f14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Leli=C3=A8vre?= <antoinel@unity3d.com>
Date: Tue, 13 Oct 2020 12:46:43 +0200
Subject: [PATCH 2/2] Updated changelog

---
 com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index 2347608849d..4f9ef97ae26 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -159,6 +159,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed profiling scope for quality RTGI.
 - Fixed the denoising and multi-sample not being used for smooth multibounce RTReflections.
 - Fixed after post process rendering pass options not showing for unlit ShaderGraphs.
+- Fixed a migration issue with the rendering queue in ShaderGraph when upgrading to 10.x;
 
 ### Changed
 - Preparation pass for RTSSShadows to be supported by render graph.