Mirror Internal/master

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs

@@ -117,6 +117,7 @@ internal bool ReassignGameObjectMaterials(GameObject go, StringBuilder errors)
                     catch (Exception ex)
                     {
                         errors.Append($"{ex.Message} while trying to reassign materials from {component}.");
+                        ok = false;
                     }
                 }
             }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/DynamicGI/DynamicGISkyOcclusion.urtshader

@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal webgpu
+#pragma only_renderers d3d11 xboxone xboxseries vulkan metal webgpu
 #define UNIFIED_RT_GROUP_SIZE_X 64
 #define UNIFIED_RT_GROUP_SIZE_Y 1
 

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)
@@ -1348,7 +1348,7 @@ private static void BakeDelegate(ref float progress, out bool done, InputExtract
                     {
                         FixSeams(
                             s_BakeData.positionRemap,
-                            s_BakeData.originalPositions,
+                            s_BakeData.sortedPositions,
                             s_BakeData.lightingJob.irradiance,
                             s_BakeData.lightingJob.validity,
                             s_BakeData.lightingJob.occlusion,
@@ -1574,7 +1574,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 consists 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
@@ -1694,7 +1694,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
@@ -1763,7 +1764,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
 
@@ -1939,7 +1940,8 @@ bool GetProbes(out NativeList<Vector3> positions)
             static void GetValidProbeInstanceIds(EntityId[] entityIds, out List<EntityId> validProbeInstanceIds)
             {
                 validProbeInstanceIds = new List<EntityId>();
-                foreach (EntityId probeInstanceId in entityIds)
                {
+                foreach (EntityId probeInstanceId in entityIds)
+                {
                     if (AdditionalGIBakeRequestsManager.GetPositionForRequest(probeInstanceId, out Vector3 _))
                     {
                         validProbeInstanceIds.Add(probeInstanceId);

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/RenderingLayerMask/TraceRenderingLayerMask.urtshader

@@ -1,3 +1,4 @@
+#pragma only_renderers d3d11 xboxone xboxseries vulkan metal webgpu
 #define UNIFIED_RT_GROUP_SIZE_X 64
 #define UNIFIED_RT_GROUP_SIZE_Y 1
 

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VirtualOffset/TraceVirtualOffset.urtshader

@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal webgpu switch switch2
+#pragma only_renderers d3d11 xboxone xboxseries vulkan metal webgpu
 #define UNIFIED_RT_GROUP_SIZE_X 64
 #define UNIFIED_RT_GROUP_SIZE_Y 1
 

Packages/com.unity.render-pipelines.core/Editor/PathTracing/BakeInputToWorldConversion.cs

@@ -418,7 +418,6 @@ internal static void ConvertInstancesAndMeshes(
                 else
                     LightmapIntegrationHelpers.ComputeUVBounds(meshes[i].uv2, out uvBoundsSizes[i], out uvBoundsOffsets[i]);
             }
-            Debug.Assert(meshes.Length == bakeInput.meshData.Length);
 
             // Baking specific settings
             RenderedGameObjectsFilter filter = RenderedGameObjectsFilter.OnlyStatic;

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

@@ -62,7 +62,7 @@ void OnMessageFromPlayer(DebugMessageHandler.MessageType messageType, DebugMessa
         void RegisterAndUpdateDebugData(string graphName, EntityId executionId, string executionName, DebugData debugData)
         {
             RegisterGraph(graphName);
-            RegisterExecution(graphName, executionId, debugData.executionName);
+            RegisterExecution(graphName, executionId, executionName);
             SetDebugData(graphName, executionId, debugData);
         }
     }

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/Editor/SampleDependencyImportSystem/SampleDependencyImporter.cs

@@ -48,7 +48,7 @@ VisualElement panelRoot
     {
         get
         {
-            _panelRoot ??= injectingElement.panel.visualTree;
+            _panelRoot ??= injectingElement?.panel?.visualTree;
             return _panelRoot;
         }
     }
@@ -82,11 +82,11 @@ VisualElement IPackageManagerExtension.CreateExtensionUI()
 
     void RefreshSampleButtons()
     {
-        if (injectingElement == null || m_PackageInfo == null || m_SampleList == null)
+        if (injectingElement == null || m_PackageInfo == null || m_SampleList == null || panelRoot == null)
             return;
 
         // Call refresh of samples and button injection when switching to the "Samples" tab.
-        if (samplesButton == null )
+        if (samplesButton == null)
         {
             samplesButton = panelRoot.Q<Button>(name: samplesButtonName);
             if (samplesButton != null)

Packages/com.unity.render-pipelines.core/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs

@@ -7,11 +7,13 @@ namespace UnityEditor.Rendering.UnifiedRayTracing
 {
     internal class ShaderTemplates
     {
+        internal static readonly Texture2D shaderIcon = EditorGUIUtility.IconContent("d_TextAsset Icon").image as Texture2D;
+
         [MenuItem("Assets/Create/Shader/Unified Ray Tracing Shader", false, 1)]
         internal static void CreateNewUnifiedRayTracingShader()
         {
             var action = ScriptableObject.CreateInstance<DoCreateUnifiedRayTracingShader>();
-            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, action, "NewUnifiedRayTracingShader.urtshader", null, null);
+            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, action, "NewUnifiedRayTracingShader.urtshader", shaderIcon, null);
         }
 
         internal class DoCreateUnifiedRayTracingShader : AssetCreationEndAction

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

@@ -32,10 +32,6 @@ private void Reset()
         /// <param name="settings"><see cref="IDebugDisplaySettings"/> to be registered</param>
         public void RegisterDebug(IDebugDisplaySettings settings)
         {
-#if UNITY_EDITOR
-            if (UnityEditor.BuildPipeline.isBuildingPlayer)
-                return;
-#endif
             DebugManager debugManager = DebugManager.instance;
             List<IDebugDisplaySettingsPanelDisposable> panels = new List<IDebugDisplaySettingsPanelDisposable>();
 

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

@@ -240,7 +240,7 @@ unsafe uint CalculateLODVisibility(int instanceIndex, bool smallMeshCulling)
         {
             GPUInstanceIndex lodGroupIndex = renderWorld.lodGroupIndices[instanceIndex];
             uint lodMask = renderWorld.lodMasks[instanceIndex];
-            
+
             if (lodGroupIndex.Equals(GPUInstanceIndex.Invalid) && lodMask == 0)
             {
                 if (viewType >= BatchCullingViewType.SelectionOutline || !smallMeshCulling || minScreenRelativeHeight == 0.0f)
@@ -476,7 +476,7 @@ public void Execute(int instanceIndex)
             InstanceHandle instance = renderWorld.indexToHandle[instanceIndex];
             InternalMeshRendererSettings rendererSettings = renderWorld.rendererSettings[instanceIndex];
             bool affectsLightmaps = LightmapUtils.AffectsLightmaps(renderWorld.lightmapIndices[instanceIndex]);
-            
+
             var visibilityMask = CalculateVisibilityMask(instanceIndex, rendererSettings.ShadowCastingMode, affectsLightmaps);
             if (visibilityMask == k_VisibilityMaskNotVisible)
             {
@@ -1979,9 +1979,7 @@ private JobHandle AnimateCrossFades(in RenderWorld renderWorld,
             }
 
             // For main camera, animate crossfades, and store the result in the hashmap to be retrieved by other cameras
-            EntityId viewID = EntityId.From(context.viewID.GetInstanceID());
-
-            if (!renderWorld.TryGetPerCameraInstanceData(viewID, out perCameraInstanceData))
+            if (!renderWorld.TryGetPerCameraInstanceData(context.viewID.GetEntityId(), out perCameraInstanceData))
             {
                 // For picking / filtering and outlining passes. We do not have animated crossfade data.
                 hasAnimatedCrossfade = false;
@@ -1999,7 +1997,7 @@ private JobHandle AnimateCrossFades(in RenderWorld renderWorld,
 
             m_LODParamsToCameraID.TryAdd(lodHash, new AnimatedFadeData
             {
-                cameraID = viewID,
+                cameraID = context.viewID.GetEntityId(),
                 jobHandle = animatedCrossFadesJob
             });
 
@@ -2038,9 +2036,8 @@ private unsafe JobHandle ScheduleFrustumCullingJob(
                     &screenRelativeMetric,
                     &meshLodConstant);
             }
-
             if (occlusionCullingCommon != null)
-                occlusionCullingCommon.UpdateSilhouettePlanes(EntityId.From(context.viewID.GetInstanceID()), receiverPlanes.SilhouettePlaneSubArray());
+                occlusionCullingCommon.UpdateSilhouettePlanes(context.viewID.GetEntityId(), receiverPlanes.SilhouettePlaneSubArray());
 
             JobHandle animatedCrossFadesJob = AnimateCrossFades(renderWorld, context,
                 out RenderWorld.PerCameraInstanceData perCameraInstanceData,
@@ -2049,7 +2046,7 @@ private unsafe JobHandle ScheduleFrustumCullingJob(
             var emptyPerCameraInstanceData = new RenderWorld.PerCameraInstanceData(0, Allocator.TempJob);
             if (!perCameraInstanceData.IsCreated)
                 perCameraInstanceData = emptyPerCameraInstanceData; // Set struct with empty NativeArray otherwise safety checks will complain
-            
+
             var cullingJob = new CullingJob
             {
                 renderWorld = renderWorld,
@@ -2218,11 +2215,10 @@ public unsafe JobHandle CreateCullJobTree(
             {
                 cullingJobHandle = ScheduleCompactedVisibilityMaskJob(renderWorld, rendererVisibilityMasks, cullingJobHandle);
 
-                EntityId viewID = EntityId.From(context.viewID.GetInstanceID());
                 int debugCounterBaseIndex = -1;
                 if (m_DebugStats?.enabled ?? false)
                 {
-                    debugCounterBaseIndex = m_SplitDebugArray.TryAddSplits(context.viewType, viewID, context.cullingSplits.Length);
+                    debugCounterBaseIndex = m_SplitDebugArray.TryAddSplits(context.viewType, context.viewID.GetEntityId(), context.cullingSplits.Length);
                 }
 
                 var batchCount = drawInstanceData.drawBatches.Length;
@@ -2237,12 +2233,12 @@ public unsafe JobHandle CreateCullJobTree(
                 var binVisibleInstanceCounts = new NativeArray<int>(maxBinCount, Allocator.TempJob, NativeArrayOptions.UninitializedMemory);
                 var binVisibleInstanceOffsets = new NativeArray<int>(maxBinCount, Allocator.TempJob, NativeArrayOptions.UninitializedMemory);
 
-                bool useOcclusionCulling = (occlusionCullingCommon != null) && occlusionCullingCommon.HasOccluderContext(viewID);
+                bool useOcclusionCulling = (occlusionCullingCommon != null) && occlusionCullingCommon.HasOccluderContext(context.viewID.GetEntityId());
                 int indirectContextIndex = -1;
                 if (useOcclusionCulling)
                 {
-                    indirectContextIndex = m_IndirectStorage.TryAllocateContext(viewID);
-                    cullingOutput.customCullingResult[0] = (IntPtr)viewID.GetRawData();
+                    indirectContextIndex = m_IndirectStorage.TryAllocateContext(context.viewID.GetEntityId());
+                    cullingOutput.customCullingResult[0] = (IntPtr)context.viewID.GetEntityId().GetRawData();
                 }
                 IndirectBufferLimits indirectBufferLimits = m_IndirectStorage.GetLimits(indirectContextIndex);
                 NativeArray<IndirectBufferAllocInfo> indirectBufferAllocInfo = m_IndirectStorage.GetAllocInfoSubArray(indirectContextIndex);
@@ -2409,7 +2405,7 @@ private JobHandle ScheduleFilteringCullingOutputJob_EditorOnly(in BatchCullingCo
             var drawOutputJob = new DrawCommandOutputFiltering
             {
                 renderWorld = renderWorld,
-                viewID = EntityId.From(context.viewID.GetInstanceID()),
+                viewID = context.viewID.GetEntityId(),
                 batchIDs = batchIDs,
                 instanceDataBuffer = instanceDataBuffer,
                 rendererVisibilityMasks = rendererVisibilityMasks,
@@ -2451,7 +2447,7 @@ private JobHandle SchedulePickingCullingOutputJob_EditorOnly(in BatchCullingCont
             var drawOutputJob = new DrawCommandOutputFiltering
             {
                 renderWorld = renderWorld,
-                viewID = EntityId.From(context.viewID.GetInstanceID()),
+                viewID = context.viewID.GetEntityId(),
                 batchIDs = batchIDs,
                 instanceDataBuffer = instanceDataBuffer,
                 rendererVisibilityMasks = rendererVisibilityMasks,