6000.4 Fixing API made public for internal reasons

Author: christopherredden

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

@@ -127,14 +127,14 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(renderer.component.GetEntityId()), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
                     uint materialID = terrain.component.renderingLayerMask; // repurpose the material id as we don't need it here
-                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(terrain.component.GetEntityId()), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;

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

@@ -223,13 +223,13 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(renderer.component.GetEntityId()), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
-                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(terrain.component.GetEntityId()), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
 using UnityEditor;
 using UnityEngine.Rendering.UnifiedRayTracing;
 
@@ -149,15 +150,15 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(renderer.component.GetEntityId()), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     int layerMask = 1 << terrain.component.gameObject.layer;
                     if ((layerMask & mask) == 0)
                         continue;
-                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(terrain.component.GetEntityId()), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;
@@ -478,8 +479,9 @@ static uint[] GetMaterialIndices(Renderer renderer)
             uint[] matIndices = new uint[submeshCount];
             for (int i = 0; i < matIndices.Length; ++i)
             {
+                Debug.Assert(UnsafeUtility.SizeOf<EntityId>() == sizeof(int), "If this assert is firing, the size of EntityId has changed. This downcase to uint is unsafe.");
                 if (i < renderer.sharedMaterials.Length && renderer.sharedMaterials[i] != null)
-                    matIndices[i] = (uint)renderer.sharedMaterials[i].GetEntityId().GetRawData();
+                    matIndices[i] = (uint)EntityId.ToULong(renderer.sharedMaterials[i].GetEntityId());
                 else
                     matIndices[i] = 0;
             }

Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs

@@ -2027,7 +2027,7 @@ public unsafe JobHandle CreateCullJobTree(
                 {
                     EntityId viewEntityId = cc.viewID.GetEntityId();
                     indirectContextIndex = m_IndirectStorage.TryAllocateContext(viewEntityId);
-                    cullingOutput.customCullingResult[0] = (IntPtr)viewEntityId.GetRawData();
+                    cullingOutput.customCullingResult[0] = (IntPtr)EntityId.ToULong(viewEntityId);
                 }
                 IndirectBufferLimits indirectBufferLimits = m_IndirectStorage.GetLimits(indirectContextIndex);
                 NativeArray<IndirectBufferAllocInfo> indirectBufferAllocInfo = m_IndirectStorage.GetAllocInfoSubArray(indirectContextIndex);

Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs

@@ -264,7 +264,7 @@ internal static ulong EntityIDToUlong(EntityId id)
             Debug.Assert(UnsafeUtility.SizeOf<EntityId>() == sizeof(int),
                 "If this assert is firing, the size of EntityId has changed. Remove the intermediate cast to int below, and cast directly to ulong instead.");
 
-            return (ulong)(int)id.GetRawData();
+            return (ulong)(int)EntityId.ToULong(id);
         }
     }
 }

Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs

@@ -209,9 +209,9 @@ internal void SetTexture(RenderTargetIdentifier tex)
         public ulong GetUniqueID()
         {
             if (m_RT != null)
-                return m_RT.GetEntityId().GetRawData();
+                return EntityId.ToULong(m_RT.GetEntityId());
             else if (m_ExternalTexture != null)
-                return m_ExternalTexture.GetEntityId().GetRawData();
+                return EntityId.ToULong(m_ExternalTexture.GetEntityId());
             else
                 return (ulong)m_NameID.GetHashCode(); // No instance ID so we return the hash code.
         }

Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs

@@ -746,7 +746,7 @@ public int GetTextureID(Texture texture)
         /// <returns>The TextureIdentifier, which stores the EntityId of the texture.</returns>
         public TextureIdentifier GetTextureIdentifier(Texture texture)
         {
-            return new TextureIdentifier(texture.GetEntityId().GetRawData());
+            return new TextureIdentifier(EntityId.ToULong(texture.GetEntityId()));
         }
 
 

Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs

@@ -86,8 +86,8 @@ private struct LightCookieMapping
                 if (d == 0)
                 {
                     // Sort by texture ID if "undecided" to batch fetches to the same cookie texture.
-                    var ai = alc.GetEntityId().GetRawData();
-                    var bi = blc.GetEntityId().GetRawData();
+                    var ai = EntityId.ToULong(alc.GetEntityId());
+                    var bi = EntityId.ToULong(blc.GetEntityId());
                     return (int)(ai - bi);
                 }
                 return d;