From b03e19d84e5468842ca59418becf0cf01d59b3fd Mon Sep 17 00:00:00 2001 From: Vincent Breysse Date: Wed, 1 Sep 2021 20:00:06 +0200 Subject: [PATCH 1/3] Add ENABLE_HYBRID_RENDERER_V2 to asmdef file --- .../Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef b/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef index 531bbde03a9..768b8e6e963 100644 --- a/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef +++ b/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef @@ -10,5 +10,11 @@ "precompiledReferences": [], "autoReferenced": false, "defineConstraints": [], - "versionDefines": [] + "versionDefines": [ + { + "name": "com.unity.rendering.hybrid", + "expression": "0.14.0-preview.0", + "define": "ENABLE_HYBRID_RENDERER_V2" + } + ] } From e2a2f247502a5c066a672cf541f8adcd2265c349 Mon Sep 17 00:00:00 2001 From: Vincent Breysse Date: Mon, 13 Sep 2021 15:04:14 +0200 Subject: [PATCH 2/3] Revert "Add ENABLE_HYBRID_RENDERER_V2 to asmdef file" This reverts commit b03e19d84e5468842ca59418becf0cf01d59b3fd. --- .../Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef b/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef index 768b8e6e963..531bbde03a9 100644 --- a/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef +++ b/com.unity.shadergraph/Editor/Utilities/Unity.ShaderGraph.Utilities.asmdef @@ -10,11 +10,5 @@ "precompiledReferences": [], "autoReferenced": false, "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.rendering.hybrid", - "expression": "0.14.0-preview.0", - "define": "ENABLE_HYBRID_RENDERER_V2" - } - ] + "versionDefines": [] } From ea33bfbdb4239f1f46d9f9cb696d29da4c99d747 Mon Sep 17 00:00:00 2001 From: Vincent Breysse Date: Mon, 13 Sep 2021 15:13:23 +0200 Subject: [PATCH 3/3] Add `ENABLE_HYBRID_RENDERER_V2` define to more asmdef files --- .../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 ed758036675..a0a37e5f818 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 @@ -30,6 +30,11 @@ "name": "com.unity.rendering.hybrid", "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" } ], "noEngineReferences": false 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 a2955e88f11..653a0dde380 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 @@ -30,6 +30,11 @@ "name": "com.unity.xr.management", "expression": "1.0.0", "define": "ENABLE_XR_MANAGEMENT" + }, + { + "name": "com.unity.rendering.hybrid", + "expression": "0.14.0-preview.0", + "define": "ENABLE_HYBRID_RENDERER_V2" } ] } diff --git a/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef b/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef index 16d379ba5ad..d882a139432 100644 --- a/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef +++ b/com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef @@ -25,6 +25,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