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

Mirror Internal/6000.4/staging

Author: KEngelstoft

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/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/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/Lighting/SurfaceCache/PatchUtil.hlsl

@@ -99,7 +99,7 @@ namespace PatchUtil
     float2 SphereToSquare(float3 n)
     {
         n /= (abs(n.x) + abs(n.y) + abs(n.z));
-        n.xy = n.z >= 0.0 ? n.xy : OctWrap(n.xy);
+        n.xy = VECTOR_LOGIC_SELECT(n.z >= 0.0, n.xy, OctWrap(n.xy));
         n.xy = n.xy * 0.5 + 0.5;
         return n.xy;
     }
@@ -151,7 +151,7 @@ namespace PatchUtil
     uint3 SignedIntegerModulo(int3 x, uint modulus)
     {
         const uint3 remainder = uint3(abs(x)) % modulus;
-        return VECTOR_LOGIC_SELECT(x < 0 && remainder != 0, modulus - remainder, remainder);
+        return VECTOR_LOGIC_SELECT(VECTOR_LOGIC_AND(x < 0, remainder != 0), modulus - remainder, remainder);
     }
 
     uint3 ConvertGridSpaceToStorageSpace(uint3 posGridSpace, uint gridSize, int3 cascadeOffset)

Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/VectorLogic.hlsl

@@ -1,15 +1,15 @@
 #ifndef VECTOR_LOGIC
 #define VECTOR_LOGIC
 
-#if defined(XBOX)
+#if defined(SHADER_API_GAMECORE)
 #define USE_HLSL2021_VECTOR_LOGIC_INTRINSICS
 #endif
 
 #if defined(USE_HLSL2021_VECTOR_LOGIC_INTRINSICS)
 
 #define VECTOR_LOGIC_AND(x, y) and(x, y)
 #define VECTOR_LOGIC_OR(x, y) or(x, y)
-#define VECTOR_LOGIC_SELECT(condition, trueValue, falseValue) select(condition, trueValue, falseValue)
+#define VECTOR_LOGIC_SELECT(condition, trueValue, falseValue) select((condition), (trueValue), (falseValue))
 
 #else
 

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);
         }
     }
 }