Skip to content

Commit 5868bf4

Browse files
[21.2] Define ENABLE_HYBRID_RENDERER_V2 by default for Hybrid Renderer 0.14.0 and newer (#5692)
* 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 * Add ENABLE_HYBRID_RENDERER_V2 to Core.Editor + HDRP.Runtime asmdefs Co-authored-by: Vincent Breysse <vincent.breysse@unity3d.com>
1 parent 7389a8c commit 5868bf4

File tree

5 files changed

+28
-2
lines changed

5 files changed

+28
-2
lines changed

com.unity.render-pipelines.core/Editor/Unity.RenderPipelines.Core.Editor.asmdef

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@
1212
"precompiledReferences": [],
1313
"autoReferenced": true,
1414
"defineConstraints": [],
15-
"versionDefines": []
16-
}
15+
"versionDefines": [
16+
{
17+
"name": "com.unity.rendering.hybrid",
18+
"expression": "0.14.0-preview.0",
19+
"define": "ENABLE_HYBRID_RENDERER_V2"
20+
}
21+
]
22+
}

com.unity.render-pipelines.core/Runtime/Unity.RenderPipelines.Core.Runtime.asmdef

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
"expression": "0.6.0-preview.0",
3232
"define": "HYBRID_0_6_0_OR_NEWER"
3333
},
34+
{
35+
"name": "com.unity.rendering.hybrid",
36+
"expression": "0.14.0-preview.0",
37+
"define": "ENABLE_HYBRID_RENDERER_V2"
38+
},
3439
{
3540
"name": "com.unity.modules.nvidia",
3641
"expression": "1.0.0",

com.unity.render-pipelines.high-definition/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
"expression": "1.0.0",
3232
"define": "ENABLE_XR_MANAGEMENT"
3333
},
34+
{
35+
"name": "com.unity.rendering.hybrid",
36+
"expression": "0.14.0-preview.0",
37+
"define": "ENABLE_HYBRID_RENDERER_V2"
38+
},
3439
{
3540
"name": "com.unity.modules.nvidia",
3641
"expression": "1.0.0",

com.unity.render-pipelines.high-definition/Runtime/Unity.RenderPipelines.HighDefinition.Runtime.asmdef

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@
5050
"name": "com.unity.burst",
5151
"expression": "1.5.0",
5252
"define": "ENABLE_BURST_1_5_0_OR_NEWER"
53+
},
54+
{
55+
"name": "com.unity.rendering.hybrid",
56+
"expression": "0.14.0-preview.0",
57+
"define": "ENABLE_HYBRID_RENDERER_V2"
5358
}
5459
],
5560
"noEngineReferences": false

com.unity.shadergraph/Editor/Unity.ShaderGraph.Editor.asmdef

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
"name": "com.unity.visualeffectgraph",
2727
"expression": "10.0.0-preview.15",
2828
"define": "VFX_GRAPH_10_0_0_OR_NEWER"
29+
},
30+
{
31+
"name": "com.unity.rendering.hybrid",
32+
"expression": "0.14.0-preview.0",
33+
"define": "ENABLE_HYBRID_RENDERER_V2"
2934
}
3035
],
3136
"noEngineReferences": false

0 commit comments

Comments
 (0)