Skip to content

Commit 320d699

Browse files
kirill-titov-uEvergreen
authored andcommitted
Fixed duplication when Rendering Layers migrate multiple times
1 parent b91e78a commit 320d699

21 files changed

+606
-74
lines changed

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/AssemblyInfo.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using System.Runtime.CompilerServices;
22

33
[assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor")]
4+
[assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor.Tests")]
45
[assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Runtime")]
56
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor")]
7+
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor.Tests")]
68
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Runtime")]
79

810

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/InternalBridge.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using System.Runtime.CompilerServices;
2+
3+
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Runtime.Shared")]

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/InternalBridge/AssemblyInfo.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using UnityEngine.Rendering;
2+
3+
// /!\ Some API shared through this bridge are in Editor assembly.
4+
// Be sure to not forget #if UNITY_EDITOR for them
5+
6+
namespace Unity.RenderPipelines.Core.Runtime.Shared.Bridge
7+
{
8+
#if UNITY_EDITOR
9+
internal static class RenderPipelineEditorUtilityBridge
10+
{
11+
internal static bool TryMigrateRenderingLayersToTagManager<T>(string[] renderingLayerNames)
12+
where T : RenderPipeline
13+
{
14+
return UnityEditor.Rendering.RenderPipelineEditorUtility.TryMigrateRenderingLayersToTagManager<T>(renderingLayerNames);
15+
}
16+
17+
internal static void ClearMigratedRenderPipelines()
18+
{
19+
UnityEditor.Rendering.RenderPipelineEditorUtility.ClearMigratedRenderPipelines();
20+
}
21+
}
22+
#endif
23+
}

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/InternalBridge/RenderPipelineEditorUtilityBridge.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "Unity.InternalAPIEngineBridge.RenderPipelines.Core.Runtime.Shared",
3+
"rootNamespace": "",
4+
"references": [],
5+
"includePlatforms": [],
6+
"excludePlatforms": [],
7+
"allowUnsafeCode": false,
8+
"overrideReferences": false,
9+
"precompiledReferences": [],
10+
"autoReferenced": true,
11+
"defineConstraints": [],
12+
"versionDefines": [],
13+
"noEngineReferences": false
14+
}

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/InternalBridge/Unity.InternalAPIEngineBridge.RenderPipelines.Core.Runtime.Shared.asmdef.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using UnityEngine.Rendering;
2+
3+
namespace Unity.RenderPipelines.Core.Runtime.Shared
4+
{
5+
#if UNITY_EDITOR
6+
internal class InternalRenderPipelineGlobalSettingsUtils
7+
{
8+
internal static bool TryMigrateRenderingLayersToTagManager<T>(string[] renderingLayerNames)
9+
where T : RenderPipeline
10+
{
11+
return Bridge.RenderPipelineEditorUtilityBridge.TryMigrateRenderingLayersToTagManager<T>(renderingLayerNames);
12+
}
13+
14+
internal static void ClearMigratedRenderPipelines()
15+
{
16+
Bridge.RenderPipelineEditorUtilityBridge.ClearMigratedRenderPipelines();
17+
}
18+
}
19+
#endif
20+
}

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/InternalRenderPipelineGlobalSettingsUtils.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)