From e25e969baae5cbb6cd5a11be89363ff335d14e24 Mon Sep 17 00:00:00 2001
From: Vincent Breysse <vincent.breysse@unity3d.com>
Date: Mon, 13 Sep 2021 15:13:23 +0200
Subject: [PATCH 1/2] Add `ENABLE_HYBRID_RENDERER_V2` define to more asmdef
 files

# Conflicts:
#	com.unity.render-pipelines.core/Runtime/Unity.RenderPipelines.Core.Runtime.asmdef
#	com.unity.render-pipelines.high-definition/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef
---
 .../Runtime/Unity.RenderPipelines.Core.Runtime.asmdef        | 5 +++++
 .../Unity.RenderPipelines.HighDefinition.Editor.asmdef       | 5 +++++
 com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/com.unity.render-pipelines.core/Runtime/Unity.RenderPipelines.Core.Runtime.asmdef b/com.unity.render-pipelines.core/Runtime/Unity.RenderPipelines.Core.Runtime.asmdef
index f8d3163e3bb..3665f6ca4e2 100644
--- a/com.unity.render-pipelines.core/Runtime/Unity.RenderPipelines.Core.Runtime.asmdef
+++ b/com.unity.render-pipelines.core/Runtime/Unity.RenderPipelines.Core.Runtime.asmdef
@@ -31,6 +31,11 @@
             "expression": "0.6.0-preview.0",
             "define": "HYBRID_0_6_0_OR_NEWER"
         },
+        {
+            "name": "com.unity.rendering.hybrid",
+            "expression": "0.14.0-preview.0",
+            "define": "ENABLE_HYBRID_RENDERER_V2"
+        },
         {
             "name": "com.unity.modules.nvidia",
             "expression": "1.0.0",
diff --git a/com.unity.render-pipelines.high-definition/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef b/com.unity.render-pipelines.high-definition/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef
index d8fdb3a0ef0..27421582cc4 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef
+++ b/com.unity.render-pipelines.high-definition/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef
@@ -31,6 +31,11 @@
             "expression": "1.0.0",
             "define": "ENABLE_XR_MANAGEMENT"
         },
+        {
+            "name": "com.unity.rendering.hybrid",
+            "expression": "0.14.0-preview.0",
+            "define": "ENABLE_HYBRID_RENDERER_V2"
+        },
         {
             "name": "com.unity.modules.nvidia",
             "expression": "1.0.0",
diff --git a/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef b/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef
index 8a86be134dc..3be78d78a92 100644
--- a/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef
+++ b/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef
@@ -26,6 +26,11 @@
             "name": "com.unity.visualeffectgraph",
             "expression": "10.0.0-preview.15",
             "define": "VFX_GRAPH_10_0_0_OR_NEWER"
+        },
+        {
+            "name": "com.unity.rendering.hybrid",
+            "expression": "0.14.0-preview.0",
+            "define": "ENABLE_HYBRID_RENDERER_V2"
         }
     ],
     "noEngineReferences": false

From d69458e10f1af4b98a7a69e4d684a9a78d84e991 Mon Sep 17 00:00:00 2001
From: Vincent Breysse <vincent.breysse@unity3d.com>
Date: Thu, 16 Sep 2021 19:31:06 +0200
Subject: [PATCH 2/2] Add ENABLE_HYBRID_RENDERER_V2 to Core.Editor +
 HDRP.Runtime asmdefs

---
 .../Editor/Unity.RenderPipelines.Core.Editor.asmdef    | 10 ++++++++--
 ...Unity.RenderPipelines.HighDefinition.Runtime.asmdef |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/com.unity.render-pipelines.core/Editor/Unity.RenderPipelines.Core.Editor.asmdef b/com.unity.render-pipelines.core/Editor/Unity.RenderPipelines.Core.Editor.asmdef
index f4e5aa37f44..214284e6275 100644
--- a/com.unity.render-pipelines.core/Editor/Unity.RenderPipelines.Core.Editor.asmdef
+++ b/com.unity.render-pipelines.core/Editor/Unity.RenderPipelines.Core.Editor.asmdef
@@ -12,5 +12,11 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": []
-}
\ No newline at end of file
+    "versionDefines": [
+      {
+          "name": "com.unity.rendering.hybrid",
+          "expression": "0.14.0-preview.0",
+          "define": "ENABLE_HYBRID_RENDERER_V2"
+      }
+    ]
+}
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Unity.RenderPipelines.HighDefinition.Runtime.asmdef b/com.unity.render-pipelines.high-definition/Runtime/Unity.RenderPipelines.HighDefinition.Runtime.asmdef
index a935c06773b..04d4fa7a07e 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Unity.RenderPipelines.HighDefinition.Runtime.asmdef
+++ b/com.unity.render-pipelines.high-definition/Runtime/Unity.RenderPipelines.HighDefinition.Runtime.asmdef
@@ -50,6 +50,11 @@
             "name": "com.unity.burst",
             "expression": "1.5.0",
             "define": "ENABLE_BURST_1_5_0_OR_NEWER"
+        },
+        {
+            "name": "com.unity.rendering.hybrid",
+            "expression": "0.14.0-preview.0",
+            "define": "ENABLE_HYBRID_RENDERER_V2"
         }
     ],
     "noEngineReferences": false