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

Mirror Internal/6000.4/staging

Author: KEngelstoft

Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/SurfaceCacheWorld.cs

@@ -149,7 +149,7 @@ public AccelStructAdapter GetAccelerationStructure()
 
         public void RemoveInstance(InstanceHandle instance)
         {
-            _rayTracingAccelerationStructure.RemoveInstance(instance.ToInt());
+            _rayTracingAccelerationStructure.RemoveInstance(instance.Value);
             _instanceHandleSet.Remove(instance);
         }
 
@@ -193,18 +193,18 @@ public InstanceHandle AddInstance(
             }
 
             InstanceHandle instance = _instanceHandleSet.Add();
-            _rayTracingAccelerationStructure.AddInstance(instance.ToInt(), mesh, localToWorldMatrix, masks, materialIndices, isOpaque, 0);
+            _rayTracingAccelerationStructure.AddInstance(instance.Value, mesh, localToWorldMatrix, masks, materialIndices, isOpaque, 0);
             return instance;
         }
 
         public void UpdateInstanceTransform(InstanceHandle instance, Matrix4x4 localToWorldMatrix)
         {
-            _rayTracingAccelerationStructure.UpdateInstanceTransform(instance.ToInt(), localToWorldMatrix);
+            _rayTracingAccelerationStructure.UpdateInstanceTransform(instance.Value, localToWorldMatrix);
         }
 
         public void UpdateInstanceMask(InstanceHandle instance, Span<uint> perSubMeshMask)
         {
-            _rayTracingAccelerationStructure.UpdateInstanceMask(instance.ToInt(), perSubMeshMask);
+            _rayTracingAccelerationStructure.UpdateInstanceMask(instance.Value, perSubMeshMask);
         }
 
         public void UpdateInstanceMaterials(InstanceHandle instance, Span<MaterialHandle> materials)
@@ -215,7 +215,7 @@ public void UpdateInstanceMaterials(InstanceHandle instance, Span<MaterialHandle
                 _materialPool.GetMaterialInfo(materials[i].Value, out materialIndices[i], out bool isTransmissive);
             }
 
-            _rayTracingAccelerationStructure.UpdateInstanceMaterialIDs(instance.ToInt(), materialIndices);
+            _rayTracingAccelerationStructure.UpdateInstanceMaterialIDs(instance.Value, materialIndices);
         }
 
         public LightHandle[] AddLights(Span<LightDescriptor> lightDescs)

Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl

@@ -155,6 +155,12 @@ struct UnityTexture3D
     TEXTURE3D(tex);
     SAMPLER(samplerstate);
 
+    // This dummy field is unused in Unity 6.4 and earlier. Here, the field is added strictly as a dummy to work around UUM-133088
+    // Without this additional field, UnityTexture3D and sampler3D_f have the exact same structure, which will cause DXC to consider
+    // them as the same type. This causes to compilation errors due to the corresponding overloads of tex3D being considered ambiguous
+    // by DXC. Adding the field resolves this. Starting from Unity 6.5, the field is actually used in code.
+    float4 hdrDecode;
+
     // these functions allows users to convert code using Texture3D to UnityTexture3D by simply changing the type of the variable
     // the existing texture macros will call these functions, which will forward the call to the texture appropriately
     float4 Sample(UnitySamplerState s, float3 uvw)                      { return SAMPLE_TEXTURE3D(tex, s.samplerstate, uvw); }

Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md

@@ -1,6 +1,6 @@
 # Deep learning super sampling (DLSS)
 
-[NVIDIA Deep Learning Super Sampling (DLSS)](https://www.nvidia.com/en-us/geforce/technologies/dlss/) is a rendering technology that uses artificial intelligence to increase graphics performance. The High Definition Render Pipeline (HDRP) natively supports DLSS 4 Super Resolution.
+[NVIDIA Deep Learning Super Sampling (DLSS)](https://www.nvidia.com/en-us/geforce/technologies/dlss/) is a rendering technology that uses artificial intelligence to increase graphics performance. The High Definition Render Pipeline (HDRP) natively supports DLSS 4.5 Super Resolution.
 
 ## Requirements and compatibility
 
@@ -82,18 +82,20 @@ Available presets are marked as '1' in the table below.
 
 | Render Preset | Maximum Quality | Balanced | Maximum Performance | Ultra Performance | DLAA | Explanation | AI Model |
 |- |- |- |- |- |- |- |- |
-| Preset F |   |   |  | 1 | 1 | Provides the highest image stability. Default value for UltraPerformance. | CNN |
-| Preset J | 1 | 1 | 1|   | 1 | Slightly lowers ghosting but increases flickering.<br/>NVIDIA recommends using **Preset K** instead of **Preset J**. | Transformer |
-| Preset K | 1 | 1 | 1|   | 1 |  Provides the highest image quality. | Transformer |
+| Preset F |   |   |  | 1 | 1 | Marked for deprecation in upcoming DLSS releases. Don't use for new projects. | CNN |
+| Preset J | 1 | 1 | 1| 1 | 1 | Slightly lowers ghosting but increases flickering.<br/>NVIDIA recommends using **Preset K** instead of **Preset J**. | Transformer |
+| Preset K | 1 | 1 | 1| 1 | 1 | Default preset for DLAA/Balanced/Quality modes. Requires fewer resources than Preset L. | Transformer |
+| Preset L |   |   |  | 1 |   | Delivers a sharper, more stable image with less ghosting than Preset J, K, but lowers performance. Recommended for RTX 40 Series GPUs and above. | Transformer Gen 2 |
+Provides about the same image quality as **Preset L**. This preset is slower than presets **J** and **K**, but faster than preset **L**. Recommended for RTX 40 Series GPUs and above.
 
 The defaults for each quality mode are:
 
 | **Quality mode** | **Default render preset** |
 |- |- |
-| **Maximum Quality** | Preset K 
-| **Balanced** | Preset K 
-| **Maximum Performance** | Preset K 
-| **Ultra Performance** | Preset F 
+| **Maximum Quality** | Preset K |
+| **Balanced** | Preset K |
+| **Maximum Performance** | Preset M |
+| **Ultra Performance** | Preset L |
 | **DLAA** | Preset K |
 
 DLSS render presets are project-specific. Presets are available only from the HDRP Asset settings. You can't override presets on a per-camera basis.

Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md

@@ -10,4 +10,3 @@ Set up a project to use the High Definition Render Pipeline (HDRP), and use Volu
 ## Additional resources
 
 - [HDRP overview](HDRP-Features.md)
-- [Achieving High Fidelity Graphics for Games with HDRP](https://resources.unity.com/unitenow/onlinesessions/achieving-high-fidelity-graphics-for-games-with-hdrp)

Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs

@@ -319,7 +319,7 @@ int CountBits(uint bitMask) // System.Numerics.BitOperations not available
                     {
                         if (preset == UnityEngine.NVIDIA.DLSSPreset.Preset_Default)
                         {
-                            labels[(int)quality][iWrite++] = "Default Preset";
+                            labels[(int)quality][iWrite++] = "Default Preset" + " - " + UnityEngine.NVIDIA.GraphicsDevice.GetDLSSPresetExplanation(preset);
                             continue;
                         }
 

Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricClouds.compute

@@ -96,22 +96,41 @@ void REPROJECT_CLOUDS(uint3 dispatchThreadId : SV_DispatchThreadID,
         float validityFactor = 1.0;
 
         #ifdef WITH_REJECTION
+        
+        bool currentIsSky = currentSceneDepth == UNITY_RAW_FAR_CLIP_VALUE;
+
         float4 lightingMin = float4(FLT_MAX, FLT_MAX, FLT_MAX, 1.0);
         float4 lightingMax = float4(0, 0, 0, 0.0);
-        for (int y = -1; y <= 1; ++y)
+
+        int skySampleCount = 0;
+        if(currentIsSky)
         {
-            for (int x = -1; x <= 1; ++x)
+            for (int y = -1; y <= 1; ++y)
             {
-                CloudReprojectionData data = GetCloudReprojectionDataSample(threadCoord, int2(x, y));
-                if ((data.pixelDepth == UNITY_RAW_FAR_CLIP_VALUE) == (currentSceneDepth == UNITY_RAW_FAR_CLIP_VALUE))
+                for (int x = -1; x <= 1; ++x)
                 {
-                    lightingMin = min(lightingMin, data.cloudLighting);
-                    lightingMax = max(lightingMax, data.cloudLighting);
+                    CloudReprojectionData data = GetCloudReprojectionDataSample(threadCoord, int2(x, y));
+                    bool sampleIsSky = data.pixelDepth == UNITY_RAW_FAR_CLIP_VALUE;
+
+                    if (sampleIsSky)
+                    {
+                        lightingMin = min(lightingMin, data.cloudLighting);
+                        lightingMax = max(lightingMax, data.cloudLighting);
+                        skySampleCount++;
+                    }
                 }
             }
+
+            // Only apply clamping if we have enough sky samples (at least 5 out of 9)
+            if (skySampleCount >= 5)
+            {
+                // Modulate validity factor based on sky sample ratio, the more samples are sky, the more ghosting reduction
+                float skyRatio = skySampleCount / 9.0;
+                previousColor = ClipCloudsToRegion(previousColor, lightingMin, lightingMax, skyRatio);
+                validityFactor *= skyRatio;
+            }
         }
 
-        previousColor = ClipCloudsToRegion(previousColor, lightingMin, lightingMax, validityFactor);
         #endif
 
         if (validTracing)

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs

@@ -183,7 +183,7 @@ private bool ShouldUseAutomaticSettings()
 
             static NVIDIA.DLSSPreset Uint2Preset(uint preset)
             {
-                if (preset >= (uint)NVIDIA.DLSSPreset.Preset_Default && preset <= (uint)NVIDIA.DLSSPreset.Preset_K)
+                if (preset >= (uint)NVIDIA.DLSSPreset.Preset_Default && preset <= (uint)NVIDIA.DLSSPreset.Preset_M)
                     return (NVIDIA.DLSSPreset)preset;
                 Debug.LogWarningFormat("Unknown DLSS Preset value {0}, using default value.", preset);
                 return NVIDIA.DLSSPreset.Preset_Default;

…urfaceCacheGlobalIlluminationStripper.cs …tingsStrippers/SurfaceCacheGIStripper.csPackages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs renamed to Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs renamed to Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs

@@ -21,7 +21,7 @@ static bool IsSurfaceCacheEnabled(List<UniversalRenderPipelineAsset> urpAssets)
 
                     foreach (var rendererFeature in rendererData.rendererFeatures)
                     {
-                        if (rendererFeature is SurfaceCacheGlobalIlluminationRendererFeature { isActive: true })
+                        if (rendererFeature is SurfaceCacheGIRendererFeature { isActive: true })
                             return true;
                     }
                 }

…eCacheGlobalIlluminationStripper.cs.meta …Strippers/SurfaceCacheGIStripper.cs.metaPackages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs.meta renamed to Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs.meta Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs.meta renamed to Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs.meta

@@ -6,8 +6,8 @@
 
 namespace UnityEditor.Rendering.Universal
 {
-    [CustomEditor(typeof(SurfaceCacheGlobalIlluminationRendererFeature))]
-    internal class SurfaceCacheGlobalIlluminationEditor : Editor
+    [CustomEditor(typeof(SurfaceCacheGIRendererFeature))]
+    internal class SurfaceCacheGIEditor : Editor
     {
         private bool m_IsInitialized;