Skip to content

Commit ad99e68

Browse files
claire-nicholsonclaire-nicholson
authored
Internal/6000.4/staging
Internal/6000.4/staging
2 parents c796b10 + 24ec1bc commit ad99e68

File tree

184 files changed

+8260
-650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+8260
-650
lines changed

‎Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static void CreateAsset(string name, Action<string> callback = null, string exte
9292
assetCreationCallback.extension = extension;
9393

9494
var icon = AssetPreview.GetMiniTypeThumbnail(type);
95-
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, assetCreationCallback, name, icon, null, false);
95+
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, assetCreationCallback, name, icon, null, false);
9696
}
9797

9898
class AssetCreationCallback : ProjectWindowCallback.AssetCreationEndAction

‎Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class CoreBuildData : IDisposable
3434
/// </summary>
3535
public List<RenderPipelineAsset> renderPipelineAssets { get; private set; } = new();
3636

37-
internal Dictionary<int, ComputeShader> computeShaderCache { get; private set; } = new();
37+
internal Dictionary<EntityId, ComputeShader> computeShaderCache { get; private set; } = new();
3838

3939
internal bool pipelineSupportGPUResidentDrawer { get; private set; } = false;
4040
internal bool playerNeedGPUResidentDrawer { get; private set; } = false;
@@ -80,8 +80,10 @@ private void CheckGPUResidentDrawerUsage()
8080
if (!playerNeedGPUResidentDrawer)
8181
return;
8282

83+
#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage
8384
GraphicsSettings.GetRenderPipelineSettings<GPUResidentDrawerResources>()
8485
.ForEachFieldOfType<ComputeShader>(computeShader => computeShaderCache.Add(computeShader.GetEntityId(), computeShader));
86+
#pragma warning restore 618
8587
}
8688

8789
/// <summary>

‎Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/ShaderStrippers/SRPDisabledComputeShaderVariantStripper.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ class SRPDisabledComputeShaderVariantStripper : IComputeShaderVariantStripper
77
{
88
public bool active => !CoreBuildData.instance.buildingPlayerForRenderPipeline;
99

10+
#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage
1011
public bool CanRemoveVariant([DisallowNull] ComputeShader shader, string _, ShaderCompilerData __)
1112
=> CoreBuildData.instance.computeShaderCache.ContainsKey(shader.GetEntityId());
13+
#pragma warning restore 618
1214
}
1315
}

‎Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public override void Initialize(ProbeVolumeBakingSet bakingSet, NativeArray<Vect
104104
Graphics.ExecuteCommandBuffer(cmd);
105105
cmd.Clear();
106106
}
107-
107+
108108
static AccelStructAdapter BuildAccelerationStructure()
109109
{
110110
var accelStruct = s_TracingContext.CreateAccelerationStructure();
@@ -127,14 +127,14 @@ static AccelStructAdapter BuildAccelerationStructure()
127127
Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
128128
perSubMeshOpaqueness.Fill(true);
129129

130-
accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
130+
accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
131131
}
132132

133133
foreach (var terrain in contributors.terrains)
134134
{
135135
uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
136136
uint materialID = terrain.component.renderingLayerMask; // repurpose the material id as we don't need it here
137-
accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
137+
accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
138138
}
139139

140140
return accelStruct;

‎Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,13 @@ static AccelStructAdapter BuildAccelerationStructure()
223223
Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
224224
perSubMeshOpaqueness.Fill(true);
225225

226-
accelStruct.AddInstance((int)renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
226+
accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
227227
}
228228

229229
foreach (var terrain in contributors.terrains)
230230
{
231231
uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
232-
accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
232+
accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
233233
}
234234

235235
return accelStruct;

‎Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,15 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
149149
Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
150150
perSubMeshOpaqueness.Fill(true);
151151

152-
accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
152+
accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
153153
}
154154

155155
foreach (var terrain in contributors.terrains)
156156
{
157157
int layerMask = 1 << terrain.component.gameObject.layer;
158158
if ((layerMask & mask) == 0)
159159
continue;
160-
161-
accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
160+
accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
162161
}
163162

164163
return accelStruct;

‎Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,13 +1643,15 @@ public static bool BakeAsync()
16431643
/// Request additional bake request manager to recompute baked data for an array of requests
16441644
/// </summary>
16451645
/// <param name="probeInstanceIDs">Array of instance IDs of the probes doing the request.</param>
1646-
public static void BakeAdditionalRequests(int[] probeInstanceIDs)
1646+
public static void BakeAdditionalRequests(EntityId[] probeInstanceIDs)
16471647
{
1648-
List<int> validProbeInstanceIDs = new List<int>();
1648+
List<EntityId> validProbeInstanceIDs = new List<EntityId>();
16491649
List<Vector3> positions = new List<Vector3>();
16501650
foreach (var probeInstanceID in probeInstanceIDs)
16511651
{
1652+
#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage
16521653
if (AdditionalGIBakeRequestsManager.GetPositionForRequest(probeInstanceID, out var position))
1654+
#pragma warning restore 618
16531655
{
16541656
validProbeInstanceIDs.Add(probeInstanceID);
16551657
positions.Add(position);
@@ -1667,21 +1669,47 @@ public static void BakeAdditionalRequests(int[] probeInstanceIDs)
16671669

16681670
for (int probeIndex = 0; probeIndex < numValidProbes; ++probeIndex)
16691671
{
1672+
#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage
16701673
AdditionalGIBakeRequestsManager.SetSHCoefficients(validProbeInstanceIDs[probeIndex], sh[probeIndex], validity[probeIndex]);
1674+
#pragma warning restore 618
16711675
}
16721676
}
16731677
}
16741678

1679+
/// <summary>
1680+
/// Request additional bake request manager to recompute baked data for a given request
1681+
/// </summary>
1682+
/// <param name="probeEntityId">The instance ID of the probe doing the request.</param>
1683+
public static void BakeAdditionalRequest(EntityId probeEntityId)
1684+
{
1685+
EntityId[] probeEntityIds = new EntityId[1];
1686+
probeEntityIds[0] = probeEntityId;
1687+
1688+
BakeAdditionalRequests(probeEntityIds);
1689+
}
1690+
1691+
// Obsolete wrapper methods for backward compatibility
1692+
/// <summary>
1693+
/// Request additional bake request manager to recompute baked data for an array of requests
1694+
/// </summary>
1695+
/// <param name="probeInstanceIDs">Array of instance IDs of the probes doing the request.</param>
1696+
[System.Obsolete("Use BakeAdditionalRequests(EntityId[]) instead. This method will be removed in a future version.")]
1697+
public static void BakeAdditionalRequests(int[] probeInstanceIDs)
1698+
{
1699+
var entityIds = new EntityId[probeInstanceIDs.Length];
1700+
for (int i = 0; i < probeInstanceIDs.Length; i++)
1701+
entityIds[i] = probeInstanceIDs[i];
1702+
BakeAdditionalRequests(entityIds);
1703+
}
1704+
16751705
/// <summary>
16761706
/// Request additional bake request manager to recompute baked data for a given request
16771707
/// </summary>
16781708
/// <param name="probeInstanceID">The instance ID of the probe doing the request.</param>
1709+
[System.Obsolete("Use BakeAdditionalRequest(EntityId) instead. This method will be removed in a future version.")]
16791710
public static void BakeAdditionalRequest(int probeInstanceID)
16801711
{
1681-
int[] probeInstanceIDs = new int[1];
1682-
probeInstanceIDs[0] = probeInstanceID;
1683-
1684-
BakeAdditionalRequests(probeInstanceIDs);
1712+
BakeAdditionalRequest((EntityId)probeInstanceID);
16851713
}
16861714

16871715
static RenderingLayerBaker renderingLayerOverride = null;

‎Packages/com.unity.render-pipelines.core/Editor/LookDev/Context.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public class ViewContext
345345
/// </summary>
346346
public bool hasViewedObject =>
347347
!String.IsNullOrEmpty(viewedObjectAssetGUID)
348-
|| viewedObjecHierarchytEntityId != 0;
348+
|| viewedObjecHierarchytEntityId != EntityId.None;
349349

350350
/// <summary>Reference to the object given for instantiation.</summary>
351351
public GameObject viewedObjectReference { get; private set; }
@@ -428,7 +428,7 @@ void LoadEnvironmentFromGUID()
428428
public void UpdateViewedObject(GameObject viewedObject)
429429
{
430430
viewedObjectAssetGUID = "";
431-
viewedObjecHierarchytEntityId = 0;
431+
viewedObjecHierarchytEntityId = EntityId.None;
432432
viewedObjectReference = null;
433433
if (viewedObject == null || viewedObject.Equals(null))
434434
return;
@@ -453,7 +453,7 @@ void LoadViewedObject()
453453
string path = AssetDatabase.GUIDToAssetPath(viewedObjectAssetGUID);
454454
viewedObjectReference = AssetDatabase.LoadAssetAtPath<GameObject>(path);
455455
}
456-
else if (viewedObjecHierarchytEntityId != 0)
456+
else if (viewedObjecHierarchytEntityId != EntityId.None)
457457
{
458458
viewedObjectReference = EditorUtility.EntityIdToObject(viewedObjecHierarchytEntityId) as GameObject;
459459
}
@@ -468,7 +468,7 @@ internal void LoadAll(bool reloadWithTemporaryID)
468468
}
469469

470470
internal void CleanTemporaryObjectIndexes()
471-
=> viewedObjecHierarchytEntityId = 0;
471+
=> viewedObjecHierarchytEntityId = EntityId.None;
472472

473473
/// <summary>Reset the camera state to default values</summary>
474474
public void ResetCameraState()

‎Packages/com.unity.render-pipelines.core/Editor/LookDev/EnvironmentLibrary.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public override void Action(EntityId entityId, string pathName, string resourceF
183183
static void Create()
184184
{
185185
var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon");
186-
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<EnvironmentLibraryCreator>(), "New EnvironmentLibrary.asset", icon, null);
186+
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance<EnvironmentLibraryCreator>(), "New EnvironmentLibrary.asset", icon, null);
187187
}
188188

189189
public static void CreateAndAssignTo(ObjectField field)

‎Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditorUtils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public override void Action(EntityId entityId, string pathName, string resourceF
3535
internal static void CreateLensFlareDataSRPAsset()
3636
{
3737
const string relativePath = "New Lens Flare (SRP).asset";
38-
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<LensFlareDataSRPCreator>(), relativePath, Icons.generic, null);
38+
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance<LensFlareDataSRPCreator>(), relativePath, Icons.generic, null);
3939
}
4040

4141
internal static LensFlareDataSRP CreateLensFlareDataSRPAsset(Scene scene, string targetName)

0 commit comments

Comments
 (0)