Internal/6000.3/staging

Packages/com.unity.render-pipelines.core/CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+- Fixed a `variant DISABLE_TEXTURE2D_X_ARRAY not found` shader error when copying MSAA textures on OpenGL ES 3.1 drivers that lack per-sample shading (`gl_SampleID`); these devices now fall back to a regular blit instead.
+
 Version Updated
 The version number for this package has increased due to a version update of a related graphics package.
 

Packages/com.unity.render-pipelines.core/Documentation~/UnifiedRayTracing/create-ray-tracing-context.md

@@ -35,7 +35,20 @@ rtResources.Load();
 ```
 **Note:** Since the Player doesn't give access to the Asset Database, this method only works in the Editor.
 
-To load the [`RayTracingResources`](xref:UnityEngine.Rendering.UnifiedRayTracing.RayTracingResources) in the Player, you can also build the **unifiedraytracing** AssetBundle. For more information about how to build and load AssetBundles, refer to [AssetBundles](xref:AssetBundlesIntro).
+To load the [`RayTracingResources`](xref:UnityEngine.Rendering.UnifiedRayTracing.RayTracingResources) in the Player, you can also build an AssetBundle that includes the following SRP Core files:
+- `Runtime/UnifiedRayTracing/Common/GeometryPool/GeometryPoolKernels.compute`
+- `Runtime/UnifiedRayTracing/Common/Utilities/CopyBuffer.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/copyPositions.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/bit_histogram.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/block_reduce_part.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/block_scan.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/build_hlbvh.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/restructure_bvh.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/scatter.compute`
+
+For more information about building and loading AssetBundles, refer to [AssetBundles](xref:AssetBundlesIntro).
+
+After you build the AssetBundle, use the following code to load it:
 ```C# 
 var rtResources = new RayTracingResources();
 

Packages/com.unity.render-pipelines.core/Documentation~/render-graph-writing-a-render-pipeline.md

@@ -124,7 +124,7 @@ public class ExampleRenderPipeline : RenderPipeline
         } 
         catch (Exception e)
         {
-            if (renderGraph.ResetGraphAndLogException(e))
+            if (myRenderGraph.ResetGraphAndLogException(e))
                 throw;
         }
 

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

@@ -116,7 +116,7 @@ static AccelStructAdapter BuildAccelerationStructure()
                     if (mesh == null)
                         continue;
 
-                    if (renderer.component is SkinnedMeshRenderer)
+                    if (renderer.component is not MeshRenderer)
                         continue;
 
                     int subMeshCount = mesh.subMeshCount;

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

@@ -213,7 +213,7 @@ static AccelStructAdapter BuildAccelerationStructure()
                     if (!s_TracingContext.TryGetMeshForAccelerationStructure(renderer.component, out var mesh))
                         continue;
 
-                    if (renderer.component is SkinnedMeshRenderer)
+                    if (renderer.component is not MeshRenderer)
                         continue;
 
                     int subMeshCount = mesh.subMeshCount;

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

@@ -140,7 +140,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     if (!s_TracingContext.TryGetMeshForAccelerationStructure(renderer.component, out var mesh))
                         continue;
 
-                    if (renderer.component is SkinnedMeshRenderer)
+                    if (renderer.component is not MeshRenderer)
                         continue;
 
                     int subMeshCount = mesh.subMeshCount;

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VoxelizeScene.hlsl

@@ -10,7 +10,7 @@ CBUFFER_START(InstanceData)
 CBUFFER_END
 #endif
 
-RWTexture3D<float>  _Output : register(u4);
+RWTexture3D<float4> _Output : register(u4);
 float               _OutputSize;
 float3              _VolumeWorldOffset;
 float3              _VolumeSize;

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

@@ -14,7 +14,15 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             euler = EditorGUI.Vector3Field(position, label, euler);
             EditorGUIUtility.wideMode = w;
             if (EditorGUI.EndChangeCheck())
-                property.quaternionValue = Quaternion.Euler(euler);
+            {
+                bool isFinite = (!float.IsNaN(euler.x) && !float.IsInfinity(euler.x) &&
+                    !float.IsNaN(euler.y) && !float.IsInfinity(euler.y) &&
+                    !float.IsNaN(euler.z) && !float.IsInfinity(euler.z));
+                if (isFinite)
+                {
+                    property.quaternionValue = Quaternion.Euler(euler.x, euler.y, euler.z);
+                }
+            }
         }
     }
 }

Packages/com.unity.render-pipelines.core/Editor/Tools/MaterialUpgrader/MaterialUpgrader.Utils.cs

@@ -303,6 +303,8 @@ internal static string PerformUpgradeInternal(
             {
                 s_UpgradeLog.AppendLine($"{progressBarName}");
 
+                bool anyMaterialModified = false;
+
                 for (int materialIndex = 0; materialIndex < materialUpgrades.Count; ++materialIndex)
                 {
                     var entry = materialUpgrades[materialIndex];
@@ -323,11 +325,16 @@ internal static string PerformUpgradeInternal(
                     else
                     {
                         s_UpgradeLog.AppendLine($"Upgrading material: {entry.MaterialInfo.Name} using shader: {entry.MaterialInfo.ShaderName}");
-                        Upgrade(entry.MaterialInfo.Material, upgraders, flags);
+                        if (entry.MaterialInfo.Material != null)
+                        {
+                            Upgrade(entry.MaterialInfo.Material, upgraders, flags);
+                            anyMaterialModified = true;
+                        }
                     }
                 }
 
-                AssetDatabase.SaveAssets();
+                if (anyMaterialModified)
+                    AssetDatabase.SaveAssets();
 
                 if (showProgressBar)
                     EditorUtility.ClearProgressBar();

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

@@ -53,7 +53,9 @@ public void RegisterDebug(IDebugDisplaySettings settings)
                     createIfNull: true,
                     groupIndex: (disposableSettingsPanel is DebugDisplaySettingsPanel debugDisplaySettingsPanel) ? debugDisplaySettingsPanel.Order : 0);
 #if UNITY_EDITOR
-                panel.documentationUrl = disposableSettingsPanel.GetType().GetCustomAttribute<HelpURLAttribute>()?.URL;
+
+                if (DocumentationUtils.TryGetHelpURL(disposableSettingsPanel.GetType(), out var documentationUrl))
+                    panel.documentationUrl = documentationUrl;
 #endif
 
                 ObservableList<DebugUI.Widget> panelChildren = panel.children;