Skip to content

Commit 1df525f

Browse files
EmilieThaulowEvergreen
EmilieThaulow
authored and
Evergreen
committed
[content automatically redacted] touching PlatformDependent folder
1 parent 3fe129c commit 1df525f

25 files changed

Lines changed: 71 additions & 54 deletions

File tree

‎Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Accumulation/DenoisePass.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class RenderDenoisePassData
3030
public SubFrameManager subFrameManager;
3131
public ScriptableRenderContext renderContext;
3232

33-
public int camID;
33+
public EntityId camID;
3434
public bool useAOV;
3535
public bool denoiseVolumetricFog;
3636
public bool temporal;

‎Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Accumulation/SubFrameManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ internal void SelectiveReset(uint maxSamples)
190190
#if UNITY_64 && ENABLE_UNITY_DENOISING_PLUGIN && (UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN)
191191
internal void ResetDenoisingStatus()
192192
{
193-
foreach (int camID in m_CameraCache.Keys.ToList())
193+
foreach (EntityId camID in m_CameraCache.Keys.ToList())
194194
{
195195
CameraData camData = GetCameraData(camID);
196196
if (camData.colorDenoiserData.denoiser != null || camData.volumetricFogDenoiserData.denoiser != null)

‎Templates/com.unity.template-hd/Packages/com.unity.template.hd/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"unity": "6000.0",
88
"description": "This template utilizes the High Definition Render Pipeline. Making it a good starting point for people focused on high-end graphics that want to develop games for platforms that support Shader Model 5.0 (DX11 and above). \n\nBeyond being tuned for High End visuals this project includes\n\u25aa Shadergraph \n\u25aa Visual Effect Graph \n\u25aa Presets \n\u25aa Example content",
99
"dependencies": {
10-
"com.unity.collab-proxy": "2.10.0",
10+
"com.unity.collab-proxy": "2.11.4",
1111
"com.unity.feature.development": "1.0.2",
12-
"com.unity.cinemachine": "2.10.4",
13-
"com.unity.inputsystem": "1.14.2",
12+
"com.unity.cinemachine": "2.10.6",
13+
"com.unity.inputsystem": "1.19.0",
1414
"com.unity.learn.iet-framework": "4.0.4",
1515
"com.unity.render-pipelines.high-definition": "17.0.4",
16-
"com.unity.timeline": "1.8.9",
16+
"com.unity.timeline": "1.8.11",
1717
"com.unity.ugui": "2.0.0",
1818
"com.unity.visualscripting": "1.9.7"
1919
}

‎Templates/com.unity.template-hd/Packages/manifest.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"dependencies": {
3-
"com.unity.cinemachine": "2.10.4",
4-
"com.unity.collab-proxy": "2.10.0",
3+
"com.unity.cinemachine": "2.10.6",
4+
"com.unity.collab-proxy": "2.11.4",
55
"com.unity.feature.development": "1.0.2",
6-
"com.unity.inputsystem": "1.14.2",
6+
"com.unity.inputsystem": "1.19.0",
77
"com.unity.learn.iet-framework": "4.0.4",
88
"com.unity.learn.iet-framework.authoring": "1.2.2",
99
"com.unity.render-pipelines.high-definition": "17.0.4",
10-
"com.unity.timeline": "1.8.9",
10+
"com.unity.timeline": "1.8.11",
1111
"com.unity.ugui": "2.0.0",
12-
"com.unity.visualscripting": "1.9.7",
12+
"com.unity.visualscripting": "1.9.11",
1313
"com.unity.modules.ai": "1.0.0",
1414
"com.unity.modules.androidjni": "1.0.0",
1515
"com.unity.modules.animation": "1.0.0",

‎Templates/com.unity.template-universal/Packages/com.unity.template.universal/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"dependencies": {
1010
"com.unity.2d.sprite": "1.0.0",
1111
"com.unity.2d.tilemap": "1.0.0",
12-
"com.unity.collab-proxy": "1.7.1",
12+
"com.unity.collab-proxy": "2.11.4",
1313
"com.unity.feature.development": "1.0.1",
1414
"com.unity.render-pipelines.universal": "13.1.0",
1515
"com.unity.textmeshpro": "3.0.6",
16-
"com.unity.timeline": "1.6.2",
16+
"com.unity.timeline": "1.8.11",
1717
"com.unity.ugui": "1.0.0",
1818
"com.unity.xr.legacyinputhelpers": "2.1.8",
1919
"com.unity.visualscripting": "1.7.7"

‎Templates/com.unity.template-universal/Packages/manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.collab-proxy": "1.7.1",
5+
"com.unity.collab-proxy": "2.11.4",
66
"com.unity.feature.development": "1.0.1",
77
"com.unity.render-pipelines.universal": "13.1.0",
88
"com.unity.test-framework": "1.1.29",
99
"com.unity.textmeshpro": "3.0.6",
10-
"com.unity.timeline": "1.6.2",
10+
"com.unity.timeline": "1.8.11",
1111
"com.unity.ugui": "1.0.0",
12-
"com.unity.visualscripting": "1.7.7",
12+
"com.unity.visualscripting": "1.9.11",
1313
"com.unity.xr.legacyinputhelpers": "2.1.8",
1414
"com.unity.modules.ai": "1.0.0",
1515
"com.unity.modules.androidjni": "1.0.0",

‎Templates/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"unity": "6000.3",
88
"description": "This template includes the settings and assets you need to start creating with the High Definition Render Pipeline (HDRP).",
99
"dependencies": {
10-
"com.unity.collab-proxy": "2.10.0",
10+
"com.unity.collab-proxy": "2.11.4",
1111
"com.unity.feature.development": "1.0.2",
1212
"com.unity.render-pipelines.high-definition": "17.0.4",
13-
"com.unity.timeline": "1.8.9",
13+
"com.unity.timeline": "1.8.11",
1414
"com.unity.ugui": "2.0.0",
1515
"com.unity.visualscripting": "1.9.7",
16-
"com.unity.inputsystem": "1.14.2"
16+
"com.unity.inputsystem": "1.19.0"
1717
}
1818
}

‎Templates/com.unity.template.hdrp-blank/Packages/manifest.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "2.10.0",
3+
"com.unity.collab-proxy": "2.11.4",
44
"com.unity.feature.development": "1.0.2",
5-
"com.unity.inputsystem": "1.14.2",
5+
"com.unity.inputsystem": "1.19.0",
66
"com.unity.multiplayer.center": "1.0.0",
77
"com.unity.render-pipelines.high-definition": "17.0.4",
8-
"com.unity.timeline": "1.8.9",
8+
"com.unity.timeline": "1.8.11",
99
"com.unity.ugui": "2.0.0",
10-
"com.unity.visualscripting": "1.9.7",
10+
"com.unity.visualscripting": "1.9.11",
1111
"com.unity.modules.accessibility": "1.0.0"
1212
}
1313
}

‎Tests/SRPTests/Packages/com.unity.testing.brg/Scripts/RenderBRG.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public struct DrawKey : IEquatable<DrawKey>, IComparable<DrawKey>
5050
public BatchMeshID meshID;
5151
public uint submeshIndex;
5252
public BatchMaterialID material;
53-
public int transparentInstanceID;
53+
public EntityId transparentInstanceID;
5454

5555
public override int GetHashCode()
5656
{
@@ -75,7 +75,7 @@ public int CompareTo(DrawKey other)
7575
}
7676
public bool Equals(DrawKey other) => CompareTo(other) == 0;
7777

78-
public bool isTransparent { get { return transparentInstanceID != 0; } }
78+
public bool isTransparent { get { return transparentInstanceID != EntityId.None; } }
7979

8080
public BatchDrawCommandFlags drawCommandFlags { get {
8181
var flags = BatchDrawCommandFlags.None;
@@ -131,7 +131,7 @@ public unsafe class RenderBRG : MonoBehaviour
131131
private NativeArray<int> m_rendererIndices;
132132
private NativeArray<int> m_drawIndices;
133133
private NativeArray<DrawRenderer> m_renderers;
134-
private NativeArray<int> m_pickingIDs;
134+
private NativeArray<EntityId> m_pickingIDs;
135135

136136
private int m_maxInstancesPerBatch;
137137
private BatchBufferTarget m_brgBufferTarget;
@@ -228,7 +228,7 @@ private struct DrawCommandOutputJob : IJob
228228
public NativeArray<BatchCullingOutputDrawCommands> drawCommands;
229229

230230
[ReadOnly]
231-
public NativeArray<int> pickingIDs;
231+
public NativeArray<EntityId> pickingIDs;
232232
public bool isPickingCulling;
233233
public int batchLayer;
234234

@@ -806,7 +806,7 @@ void Start()
806806
#endif
807807

808808
m_renderers = new NativeArray<DrawRenderer>(renderers.Length, Allocator.Persistent);
809-
m_pickingIDs = new NativeArray<int>(numPickingIDs, Allocator.Persistent);
809+
m_pickingIDs = new NativeArray<EntityId>(numPickingIDs, Allocator.Persistent);
810810
m_batchHash = new NativeParallelHashMap<DrawKey, int>(1024, Allocator.Persistent);
811811
m_rangeHash = new NativeParallelHashMap<RangeKey, int>(1024, Allocator.Persistent);
812812
m_drawBatches = new NativeList<DrawBatch>(Allocator.Persistent);
@@ -1014,7 +1014,7 @@ private void CreateBatchesForRenderers(
10141014
private void ExtractPickingID(int rendererIndex, MeshRenderer meshRenderer)
10151015
{
10161016
#if ENABLE_PICKING
1017-
m_pickingIDs[rendererIndex] = meshRenderer.gameObject.GetInstanceID();
1017+
m_pickingIDs[rendererIndex] = meshRenderer.gameObject.GetEntityId();
10181018
#endif
10191019
}
10201020

@@ -1125,7 +1125,7 @@ private int BinRenderers(MeshRenderer[] renderers, NativeParallelMultiHashMap<Dr
11251125
material = material,
11261126
meshID = mesh,
11271127
submeshIndex = (uint)matIndex,
1128-
transparentInstanceID = isTransparent ? renderer.GetInstanceID() : 0,
1128+
transparentInstanceID = isTransparent ? renderer.GetEntityId() : EntityId.None,
11291129
};
11301130

11311131
renderersByKey.Add(key, rendererIndex);

‎Tests/SRPTests/Packages/com.unity.testing.urp-upgrade/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"dependencies": {
1717
"nuget.moq": "1.0.0",
1818
"com.unity.render-pipelines.universal": "12.0.0",
19-
"com.unity.timeline": "1.6.0-pre.3"
19+
"com.unity.timeline": "1.8.11"
2020
}
2121
}

0 commit comments

Comments
 (0)