Merge pull request #8258 from Unity-Technologies/internal/6000.4/staging

Mirror Internal/6000.4/staging

Author: KEngelstoft

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

@@ -668,7 +668,7 @@ static void UpdateLightStatus()
             var sceneLights = new Dictionary<Scene, List<Light>>();
 
             // Modify each baked light, take note of which scenes they belong to.
-            var allLights = Object.FindObjectsByType<Light>(FindObjectsSortMode.None);
+            var allLights = Object.FindObjectsByType<Light>();
             foreach (var light in allLights)
             {
                 if (light.lightmapBakeType != LightmapBakeType.Realtime)

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

@@ -73,7 +73,9 @@ internal static List<ProbeVolumePerSceneData> GetPerSceneDataList()
 
         internal static List<ProbeVolume> GetProbeVolumeList()
         {
+            #pragma warning disable CS0618 // Type or member is obsolete
             var fullPvList = GameObject.FindObjectsByType<ProbeVolume>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             List<ProbeVolume> usedPVList;
 
             if (isBakingSceneSubset)

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

@@ -306,13 +306,13 @@ public BakingBatch(Vector3Int cellCount, ProbeReferenceVolume refVolume)
             maxBrickCount = cellCount * ProbeReferenceVolume.CellSize(refVolume.GetMaxSubdivision());
             inverseScale = ProbeBrickPool.kBrickCellCount / refVolume.MinBrickSize();
             offset = refVolume.ProbeOffset();
-            
+
             // Initialize NativeHashMaps with reasonable initial capacity
             // Using a larger capacity to reduce allocations during baking
             positionToIndex = new NativeHashMap<int, int>(100000, Allocator.Persistent);
             uniqueBrickSubdiv = new NativeHashMap<int, int>(100000, Allocator.Persistent);
         }
-        
+
         public void Dispose()
         {
             if (positionToIndex.IsCreated)
@@ -746,7 +746,9 @@ static internal void Clear()
             if (activeSet != null)
                 activeSet.Clear();
 
+            #pragma warning disable CS0618 // Type or member is obsolete
             var probeVolumes = GameObject.FindObjectsByType<ProbeVolume>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
             foreach (var probeVolume in probeVolumes)
                 probeVolume.OnLightingDataAssetCleared();
         }
@@ -879,7 +881,9 @@ static void CellCountInDirections(out Vector3Int minCellPositionXYZ, out Vector3
         static TouchupVolumeWithBoundsList GetAdjustementVolumes()
         {
             // This is slow, but we should have very little amount of touchup volumes.
+#pragma warning disable CS0618 // Type or member is obsolete
             var touchupVolumes = Object.FindObjectsByType<ProbeAdjustmentVolume>(FindObjectsSortMode.InstanceID);
+#pragma warning restore CS0618 // Type or member is obsolete
 
             var touchupVolumesAndBounds = new TouchupVolumeWithBoundsList(touchupVolumes.Length);
             foreach (var touchup in touchupVolumes)
@@ -1098,7 +1102,7 @@ static void BakeDelegate(ref float progress, ref bool done)
                     {
                         FixSeams(
                             s_BakeData.positionRemap,
-                            s_BakeData.originalPositions,
+                            s_BakeData.sortedPositions,
                             s_BakeData.lightingJob.irradiance,
                             s_BakeData.lightingJob.validity,
                             s_BakeData.lightingJob.occlusion,
@@ -1323,7 +1327,7 @@ internal static void FixSeams(
             NativeArray<Vector4> skyOcclusion,
             NativeArray<uint> renderingLayerMasks)
         {
-            // Seams are caused are caused by probes on the boundary between two subdivision levels
+            // Seams are caused by probes on the boundary between two subdivision levels
             // The idea is to find first them and do a kind of dilation to smooth the values on the boundary
             // the dilation process consits in doing a trilinear sample of the higher subdivision brick and override the lower subdiv with that
             // We have to mark the probes on the boundary as valid otherwise leak reduction at runtime will interfere with this method
@@ -1443,7 +1447,8 @@ Vector3Int GetCellPositionFromVoxel(Vector3Int voxelToLookup, int cellSizeInBric
                             {
                                 uint renderingLayerMask = renderingLayerMasks[positionRemap[index]];
                                 bool commonRenderingLayer = (renderingLayerMask & probeRenderingLayerMask) != 0;
-                                if (!commonRenderingLayer) continue; // We do not use this probe contribution if it does not share at least a common rendering layer
+                                if (!commonRenderingLayer)
+                                    continue; // We do not use this probe contribution if it does not share at least a common rendering layer
                             }
 
                             // Do the lerp in compressed format to match result on GPU
@@ -1512,7 +1517,7 @@ static void ApplyPostBakeOperations()
             var chunkSizeInProbes = ProbeBrickPool.GetChunkSizeInProbeCount();
             var hasVirtualOffsets = m_BakingSet.settings.virtualOffsetSettings.useVirtualOffset;
             var hasRenderingLayers = m_BakingSet.useRenderingLayers;
-            
+
             if (!ValidateBakingCellsSize(bakingCellsArray, chunkSizeInProbes, hasVirtualOffsets, hasRenderingLayers))
                 return; // Early exit if validation fails
 

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

@@ -42,7 +42,9 @@ static void UpdateRealtimeSubdivisionDebug()
 
                 if (Time.realtimeSinceStartupAsDouble - s_LastSubdivisionTime > debugDisplay.subdivisionDelayInSeconds)
                 {
+                    #pragma warning disable CS0618 // Type or member is obsolete
                     var probeVolume = GameObject.FindFirstObjectByType<ProbeVolume>();
+#pragma warning restore CS0618 // Type or member is obsolete
                     if (probeVolume == null || !probeVolume.isActiveAndEnabled)
                         return;
 

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

@@ -1216,7 +1216,9 @@ internal class ProbeVolumeOverlay : Overlay, ITransientOverlay
             {
                 if (ProbeReferenceVolume.instance.probeVolumeDebug.realtimeSubdivision)
                 {
+                    #pragma warning disable CS0618 // Type or member is obsolete
                     var probeVolume = GameObject.FindFirstObjectByType<ProbeVolume>();
+#pragma warning restore CS0618 // Type or member is obsolete
                     if (probeVolume != null && probeVolume.isActiveAndEnabled)
                     {
                         var profile = ProbeVolumeBakingSet.GetBakingSetForScene(probeVolume.gameObject.scene);

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.PlayerConnection.cs

@@ -24,8 +24,6 @@ public PlayerConnection(IConnectionState connectionState, UnityEngine.Events.Uni
                 EditorConnection.instance.Initialize();
                 EditorConnection.instance.RegisterConnection(m_OnPlayerConnected);
                 EditorConnection.instance.RegisterDisconnection(m_OnPlayerDisconnected);
-
-                EditorApplication.quitting += OnEditorQuitting;
             }
 
             public void Dispose()
@@ -35,27 +33,15 @@ public void Dispose()
                     EditorConnection.instance.UnregisterConnection(m_OnPlayerConnected);
                     EditorConnection.instance.UnregisterDisconnection(m_OnPlayerDisconnected);
 
-                    // NOTE: There is a bug where editor crashes if we call DisconnectAll during shutdown flow. In this case
-                    // it's fine to skip the disconnect as the player will get notified of it anyway.
-                    if (!m_EditorQuitting)
-                        EditorConnection.instance.DisconnectAll();
-
                     m_ConnectionState.Dispose();
                     m_ConnectionState = null;
-
-                    EditorApplication.quitting -= OnEditorQuitting;
                 }
             }
 
             public void OnConnectionDropdownIMGUI()
             {
                 PlayerConnectionGUILayout.ConnectionTargetSelectionDropdown(m_ConnectionState, EditorStyles.toolbarDropDown, 250);
             }
-
-            void OnEditorQuitting()
-            {
-                m_EditorQuitting = true;
-            }
         }
     }
 }

Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.cs

@@ -227,7 +227,9 @@ void EnsurePersistentCanvas()
         {
             if (m_RootUIPersistentCanvas == null)
             {
+                #pragma warning disable CS0618 // Type or member is obsolete
                 var uiManager = UnityObject.FindFirstObjectByType<DebugUIHandlerPersistentCanvas>();
+#pragma warning restore CS0618 // Type or member is obsolete
 
                 if (uiManager == null)
                 {

Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUpdater.cs

@@ -80,7 +80,7 @@ internal static void HandleInternalEventSystemComponents(bool uiEnabled)
 
         void EnsureExactlyOneEventSystem()
         {
-            var eventSystems = FindObjectsByType<EventSystem>(FindObjectsSortMode.None);
+            var eventSystems = FindObjectsByType<EventSystem>();
             var debugEventSystem = GetComponent<EventSystem>();
 
             if (eventSystems.Length > 1 && debugEventSystem != null)

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

@@ -924,12 +924,12 @@ private unsafe struct FindRenderersFromMaterialOrMeshJob : IJobParallelForBatch
 
             public void Execute(int startIndex, int count)
             {
-                int* renderersToAddForMaterialsPtr = stackalloc int[k_BatchSize];
-                var renderersToAddForMaterials = new UnsafeList<int>(renderersToAddForMaterialsPtr, k_BatchSize);
+                EntityId* renderersToAddForMaterialsPtr = stackalloc EntityId[k_BatchSize];
+                var renderersToAddForMaterials = new UnsafeList<EntityId>(renderersToAddForMaterialsPtr, k_BatchSize);
                 renderersToAddForMaterials.Length = 0;
 
-                int* renderersToAddForMeshesPtr = stackalloc int[k_BatchSize];
-                var renderersToAddForMeshes = new UnsafeList<int>(renderersToAddForMeshesPtr, k_BatchSize);
+                EntityId* renderersToAddForMeshesPtr = stackalloc EntityId[k_BatchSize];
+                var renderersToAddForMeshes = new UnsafeList<EntityId>(renderersToAddForMeshesPtr, k_BatchSize);
                 renderersToAddForMeshes.Length = 0;
 
                 for (int index = 0; index < count; index++)
@@ -945,9 +945,7 @@ public void Execute(int startIndex, int count)
                         var meshID = meshIDArray[rendererIndex];
                         if (meshIDs.Contains(meshID))
                         {
-#pragma warning disable 618 // todo @emilie.thaulow make renderID an EntityId
                             renderersToAddForMeshes.AddNoResize(rendererID);
-#pragma warning restore 618
                             // We can skip the material check if we found a mesh match since at this point
                             // the renderer is already added and will be processed by the mesh branch
                             continue;

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

@@ -1281,7 +1281,7 @@ internal enum FilteringJobMode
     internal unsafe struct DrawCommandOutputFiltering : IJob
     {
         [ReadOnly] public NativeParallelHashMap<uint, BatchID> batchIDs;
-        [ReadOnly] public int viewID;
+        [ReadOnly] public EntityId viewID;
 
         [ReadOnly] public GPUInstanceDataBuffer.ReadOnly instanceDataBuffer;
 
@@ -1816,10 +1816,8 @@ private JobHandle AnimateCrossFades(CPUPerCameraInstanceData perCameraInstanceDa
             }
 
             //For main camera, animate crossfades, and store the result in the hashmap to be retrieved by other cameras
-            var viewID = cc.viewID.GetInstanceID();
-#pragma warning disable 618 // todo @emilie.thaulow make viewID an EntityId
-            hasAnimatedCrossfade = perCameraInstanceData.perCameraData.TryGetValue(viewID, out var tmpCameraInstanceData);
-#pragma warning restore 618
+            var viewID = cc.viewID;
+            hasAnimatedCrossfade = perCameraInstanceData.perCameraData.TryGetValue(viewID.GetEntityId(), out var tmpCameraInstanceData);
             if (hasAnimatedCrossfade == false)
             {
                 // For picking / filtering and outlining passes. We do not have animated crossfade data.
@@ -1836,9 +1834,7 @@ private JobHandle AnimateCrossFades(CPUPerCameraInstanceData perCameraInstanceDa
                 crossFadeArray = cameraInstanceData.crossFades
             }.Schedule(perCameraInstanceData.instancesLength, AnimateCrossFadeJob.k_BatchSize);
 
-#pragma warning disable 618 // todo @emilie.thaulow make viewID an EntityId
-            m_LODParamsToCameraID.TryAdd(lodHash, new AnimatedFadeData(){ cameraID = viewID, jobHandle = handle});
-#pragma warning restore 618
+            m_LODParamsToCameraID.TryAdd(lodHash, new AnimatedFadeData(){ cameraID = viewID.GetEntityId(), jobHandle = handle});
             return handle;
         }
 
@@ -1868,10 +1864,8 @@ private unsafe JobHandle CreateFrustumCullingJob(
                 InstanceCullerBurst.SetupCullingJobInput(QualitySettings.lodBias, QualitySettings.meshLodThreshold, contextPtr, &receiverPlanes, &receiverSphereCuller,
                                                          &frustumPlaneCuller, &screenRelativeMetric, &meshLodConstant);
             }
-#pragma warning disable 618 // todo @emilie.thaulow make GetInstanceID return EntityId
             if (occlusionCullingCommon != null)
-                occlusionCullingCommon.UpdateSilhouettePlanes(cc.viewID.GetInstanceID(), receiverPlanes.SilhouettePlaneSubArray());
-#pragma warning restore 618
+                occlusionCullingCommon.UpdateSilhouettePlanes(cc.viewID.GetEntityId(), receiverPlanes.SilhouettePlaneSubArray());
 
             var jobHandle = AnimateCrossFades(perCameraInstanceData, cc, out var cameraInstanceData, out var hasAnimatedCrossfade);
 
@@ -2012,9 +2006,7 @@ public unsafe JobHandle CreateCullJobTree(
                 int debugCounterBaseIndex = -1;
                 if (m_DebugStats?.enabled ?? false)
                 {
-#pragma warning disable 618 // todo @emilie.thaulow make GetInstanceID return EntityId
-                    debugCounterBaseIndex = m_SplitDebugArray.TryAddSplits(cc.viewType, cc.viewID.GetInstanceID(), cc.cullingSplits.Length);
-#pragma warning restore 618
+                    debugCounterBaseIndex = m_SplitDebugArray.TryAddSplits(cc.viewType, cc.viewID.GetEntityId(), cc.cullingSplits.Length);
                 }
 
                 var batchCount = drawInstanceData.drawBatches.Length;
@@ -2030,16 +2022,12 @@ public unsafe JobHandle CreateCullJobTree(
                 var binVisibleInstanceOffsets = new NativeArray<int>(maxBinCount, Allocator.TempJob, NativeArrayOptions.UninitializedMemory);
 
                 int indirectContextIndex = -1;
-#pragma warning disable 618 //todo @emilie.thaulow make GetInstanceID return EntityId
-                bool useOcclusionCulling = (occlusionCullingCommon != null) && occlusionCullingCommon.HasOccluderContext(cc.viewID.GetInstanceID());
-#pragma warning restore 618
+                bool useOcclusionCulling = (occlusionCullingCommon != null) && occlusionCullingCommon.HasOccluderContext(cc.viewID.GetEntityId());
                 if (useOcclusionCulling)
                 {
-#pragma warning disable 618 // todo @emilie.thaulow make GetInstanceID return EntityId
-                    int viewInstanceID = cc.viewID.GetInstanceID();
-                    indirectContextIndex = m_IndirectStorage.TryAllocateContext(viewInstanceID);
-#pragma warning restore 618
-                    cullingOutput.customCullingResult[0] = (IntPtr)viewInstanceID;
+                    EntityId viewEntityId = cc.viewID.GetEntityId();
+                    indirectContextIndex = m_IndirectStorage.TryAllocateContext(viewEntityId);
+                    cullingOutput.customCullingResult[0] = (IntPtr)viewEntityId.GetRawData();
                 }
                 IndirectBufferLimits indirectBufferLimits = m_IndirectStorage.GetLimits(indirectContextIndex);
                 NativeArray<IndirectBufferAllocInfo> indirectBufferAllocInfo = m_IndirectStorage.GetAllocInfoSubArray(indirectContextIndex);
@@ -2201,7 +2189,7 @@ private JobHandle CreateFilteringCullingOutputJob_EditorOnly(in BatchCullingCont
 
             var drawOutputJob = new DrawCommandOutputFiltering
             {
-                viewID = cc.viewID.GetInstanceID(),
+                viewID = cc.viewID.GetEntityId(),
                 batchIDs = batchIDs,
                 instanceDataBuffer = instanceDataBuffer,
                 rendererVisibilityMasks = rendererVisibilityMasks,
@@ -2244,7 +2232,7 @@ private JobHandle CreatePickingCullingOutputJob_EditorOnly(in BatchCullingContex
 
             var drawOutputJob = new DrawCommandOutputFiltering
             {
-                viewID = cc.viewID.GetInstanceID(),
+                viewID = cc.viewID.GetEntityId(),
                 batchIDs = batchIDs,
                 instanceDataBuffer = instanceDataBuffer,
                 rendererVisibilityMasks = rendererVisibilityMasks,