Internal/6000.4/staging

Internal/6000.4/staging

Author: claire-nicholson

Packages/com.unity.render-pipelines.core/Documentation~/Images/Preferences/PopUpAdvanced.png

@@ -36,6 +36,7 @@
   * [Customize the UI of a setting](customize-ui-for-a-setting.md)
   * [Get custom graphics settings](get-custom-graphics-settings.md)
   * [Include or exclude a setting in your build](choose-whether-unity-includes-a-graphics-setting-in-your-build.md)
+  * [Advanced Properties](advanced-properties.md)
 * [Shaders](shaders.md)
   * [Use shader methods from the SRP Core shader library](built-in-shader-methods.md)
   * [Synchronizing shader code and C#](generating-shader-includes.md)

Packages/com.unity.render-pipelines.core/Documentation~/TableOfContents.md

@@ -12,29 +12,29 @@ There is a global state per user that stores if Unity displays **advanced proper
 ## Exposing advanced properties within the inspector
 
 Not every component or Volume Override includes advanced properties.
-If one does, it has a contextual menu to the right of each property section header that includes additional properties. To expose advanced properties for that section, open the contextual menu and click **Advanced Properties**.
+If one does, it has a contextual menu to the right of each property section header that includes additional properties. To expose advanced properties for that section, open the contextual menu and click **Show All Advanced Properties**.
 
 For an example, refer to the **Water Surface** component in [High Definition Render Pipeline (HDRP)](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest?subfolder=/manual/settings-and-properties-related-to-the-water-system.html).
 
 By default only standard properties are shown.
 
 ![](Images/Preferences/HDRP_WaterSurface_General.png)
 
-When you select **Advanced Properties**:
+When you select **Show All Advanced Properties**:
 
 ![](Images/Preferences/PopUpAdvanced.png)
 
 **Advanced Properties** become visible:
 
 ![](Images/Preferences/HDRP_WaterSurface_General_Visible.png)
 
-For Volume Overrides, the already existing contextual menu has a **Advanced Properties** toggle as well.
+For Volume Overrides, the already existing contextual menu has a **Show All Advanced Properties** toggle as well.
 
 ## Exposing advanced properties on preferences
 
 You can also access to this global preference by:
 
-1. Open the **Graphics** tab in the **Preferences** window (menu: **Edit > Preferences > Graphics**).
-2. Under **Properties**. Set **Advanced Properties** to **All Visible**.
+1. Open the **Graphics** tab in the **Preferences** window (menu: **Edit > Preferences**, macOS: **Unity > Settings**).
+2. Under **Graphics**, select **Properties**. Set **Advanced Properties** to **All Visible**.
 
 ![](Images/Preferences/AdvancedProperties_Settings.png)

Packages/com.unity.render-pipelines.core/Documentation~/advanced-properties.md

@@ -4,6 +4,5 @@
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor.Tests")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor.Tests")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor.Tests")]
-[assembly: InternalsVisibleTo("Unity.Testing.VisualEffectGraph.EditorTests")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor-testable")]
 

Packages/com.unity.render-pipelines.core/Editor/AssemblyInfo.cs

@@ -81,7 +81,7 @@ private void CheckGPUResidentDrawerUsage()
                 return;
 
             GraphicsSettings.GetRenderPipelineSettings<GPUResidentDrawerResources>()
-                .ForEachFieldOfType<ComputeShader>(computeShader => computeShaderCache.Add(computeShader.GetInstanceID(), computeShader));
+                .ForEachFieldOfType<ComputeShader>(computeShader => computeShaderCache.Add(computeShader.GetEntityId(), computeShader));
         }
 
         /// <summary>

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

@@ -8,6 +8,6 @@ class SRPDisabledComputeShaderVariantStripper : IComputeShaderVariantStripper
         public bool active => !CoreBuildData.instance.buildingPlayerForRenderPipeline;
 
         public bool CanRemoveVariant([DisallowNull] ComputeShader shader, string _, ShaderCompilerData __)
-            => CoreBuildData.instance.computeShaderCache.ContainsKey(shader.GetInstanceID());
+            => CoreBuildData.instance.computeShaderCache.ContainsKey(shader.GetEntityId());
     }
 }

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

@@ -30,7 +30,7 @@ public int selectedPanel
             get => Mathf.Max(0, DebugManager.instance.PanelIndex(selectedPanelDisplayName));
             set
             {
-                var displayName = DebugManager.instance.PanelDiplayName(value);
+                var displayName = DebugManager.instance.PanelDisplayName(value);
                 if (!string.IsNullOrEmpty(displayName))
                     selectedPanelDisplayName = displayName;
             }

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -127,14 +127,14 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetInstanceID(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(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.GetInstanceID(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(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.RenderingLayers.cs

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

@@ -149,7 +149,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetInstanceID(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
@@ -158,7 +158,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     if ((layerMask & mask) == 0)
                         continue;
 
-                    accelStruct.AddInstance(terrain.component.GetInstanceID(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;
@@ -350,7 +350,7 @@ static internal void RecomputeVOForDebugOnly()
             var chunkSizeInProbes = ProbeBrickPool.GetChunkSizeInProbeCount();
             var hasVirtualOffsets = m_BakingSet.settings.virtualOffsetSettings.useVirtualOffset;
             var hasRenderingLayers = m_BakingSet.useRenderingLayers;
-            
+
             if (ValidateBakingCellsSize(bakingCellsArray, chunkSizeInProbes, hasVirtualOffsets, hasRenderingLayers))
             {
                 // Write back the assets.
@@ -480,7 +480,7 @@ static uint[] GetMaterialIndices(Renderer renderer)
             for (int i = 0; i < matIndices.Length; ++i)
             {
                 if (i < renderer.sharedMaterials.Length && renderer.sharedMaterials[i] != null)
-                    matIndices[i] = (uint)renderer.sharedMaterials[i].GetInstanceID();
+                    matIndices[i] = (uint)renderer.sharedMaterials[i].GetEntityId().GetRawData();
                 else
                     matIndices[i] = 0;
             }