Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging

Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/Default Lens Flare (SRP).asset

@@ -19,6 +19,13 @@ MonoBehaviour:
     positionOffset: {x: 0, y: 0}
     angularOffset: 0
     translationScale: {x: 1, y: 1}
+    ringThickness: 0.25
+    hoopFactor: 1
+    noiseAmplitude: 1
+    noiseFrequency: 1
+    noiseSpeed: 0
+    shapeCutOffSpeed: 0
+    shapeCutOffRadius: 10
     m_LocalIntensity: 1
     lensFlareTexture: {fileID: 0}
     uniformScale: 15
@@ -27,9 +34,9 @@ MonoBehaviour:
     m_Count: 5
     preserveAspectRatio: 0
     rotation: 0
-    tintConst: 1
+    tintColorType: 0
     tint: {r: 1, g: 1, b: 1, a: 0.5}
-    tintRadial:
+    tintGradient:
       <textureSize>k__BackingField: 4
       m_Gradient:
         serializedVersion: 2
@@ -216,6 +223,13 @@ MonoBehaviour:
     positionOffset: {x: 0, y: 0}
     angularOffset: 0
     translationScale: {x: 1, y: 1}
+    ringThickness: 0.25
+    hoopFactor: 1
+    noiseAmplitude: 1
+    noiseFrequency: 1
+    noiseSpeed: 0
+    shapeCutOffSpeed: 0
+    shapeCutOffRadius: 10
     m_LocalIntensity: 0.05
     lensFlareTexture: {fileID: 2800000, guid: da47326d6c6190a4e8793de9a26bf176, type: 3}
     uniformScale: 0.3
@@ -224,9 +238,9 @@ MonoBehaviour:
     m_Count: 5
     preserveAspectRatio: 0
     rotation: 0
-    tintConst: 1
+    tintColorType: 0
     tint: {r: 0.49673662, g: 0.8679245, b: 0.55442125, a: 0.5}
-    tintRadial:
+    tintGradient:
       <textureSize>k__BackingField: 4
       m_Gradient:
         serializedVersion: 2
@@ -431,6 +445,13 @@ MonoBehaviour:
     positionOffset: {x: 0, y: 0}
     angularOffset: 0
     translationScale: {x: 1, y: 1}
+    ringThickness: 0.25
+    hoopFactor: 1
+    noiseAmplitude: 1
+    noiseFrequency: 1
+    noiseSpeed: 0
+    shapeCutOffSpeed: 0
+    shapeCutOffRadius: 10
     m_LocalIntensity: 0.1
     lensFlareTexture: {fileID: 2800000, guid: da47326d6c6190a4e8793de9a26bf176, type: 3}
     uniformScale: 0.35
@@ -439,9 +460,9 @@ MonoBehaviour:
     m_Count: 4
     preserveAspectRatio: 0
     rotation: 0
-    tintConst: 1
+    tintColorType: 0
     tint: {r: 0.9245283, g: 0.6026995, b: 0.5552984, a: 0.5}
-    tintRadial:
+    tintGradient:
       <textureSize>k__BackingField: 4
       m_Gradient:
         serializedVersion: 2
@@ -655,6 +676,13 @@ MonoBehaviour:
     positionOffset: {x: 0, y: 0}
     angularOffset: 0
     translationScale: {x: 1, y: 1}
+    ringThickness: 0.25
+    hoopFactor: 1
+    noiseAmplitude: 1
+    noiseFrequency: 1
+    noiseSpeed: 0
+    shapeCutOffSpeed: 0
+    shapeCutOffRadius: 10
     m_LocalIntensity: 0.1
     lensFlareTexture: {fileID: 2800000, guid: da47326d6c6190a4e8793de9a26bf176, type: 3}
     uniformScale: 0.3
@@ -663,9 +691,9 @@ MonoBehaviour:
     m_Count: 2
     preserveAspectRatio: 0
     rotation: 0
-    tintConst: 1
+    tintColorType: 0
     tint: {r: 0.9245283, g: 0.6026995, b: 0.5552984, a: 0.5}
-    tintRadial:
+    tintGradient:
       <textureSize>k__BackingField: 4
       m_Gradient:
         serializedVersion: 2
@@ -852,6 +880,13 @@ MonoBehaviour:
     positionOffset: {x: 0, y: 0}
     angularOffset: 0
     translationScale: {x: 1, y: 1}
+    ringThickness: 0.25
+    hoopFactor: 1
+    noiseAmplitude: 1
+    noiseFrequency: 1
+    noiseSpeed: 0
+    shapeCutOffSpeed: 0
+    shapeCutOffRadius: 10
     m_LocalIntensity: 0.03
     lensFlareTexture: {fileID: 2800000, guid: da47326d6c6190a4e8793de9a26bf176, type: 3}
     uniformScale: 1.5
@@ -860,9 +895,9 @@ MonoBehaviour:
     m_Count: 4
     preserveAspectRatio: 0
     rotation: 0
-    tintConst: 1
+    tintColorType: 0
     tint: {r: 0.34509802, g: 0.65088975, b: 1, a: 0.5}
-    tintRadial:
+    tintGradient:
       <textureSize>k__BackingField: 4
       m_Gradient:
         serializedVersion: 2
@@ -1049,6 +1084,13 @@ MonoBehaviour:
     positionOffset: {x: 0, y: 0}
     angularOffset: 2
     translationScale: {x: 1, y: 1}
+    ringThickness: 0.25
+    hoopFactor: 1
+    noiseAmplitude: 1
+    noiseFrequency: 1
+    noiseSpeed: 0
+    shapeCutOffSpeed: 0
+    shapeCutOffRadius: 10
     m_LocalIntensity: 0.015
     lensFlareTexture: {fileID: 2800000, guid: da47326d6c6190a4e8793de9a26bf176, type: 3}
     uniformScale: 2
@@ -1057,9 +1099,9 @@ MonoBehaviour:
     m_Count: 3
     preserveAspectRatio: 0
     rotation: 0
-    tintConst: 1
+    tintColorType: 0
     tint: {r: 0.34509802, g: 1, b: 0.7484353, a: 0.5}
-    tintRadial:
+    tintGradient:
       <textureSize>k__BackingField: 4
       m_Gradient:
         serializedVersion: 2
@@ -1246,6 +1288,13 @@ MonoBehaviour:
     positionOffset: {x: 0, y: 0}
     angularOffset: 0
     translationScale: {x: 1, y: 1}
+    ringThickness: 0.25
+    hoopFactor: 1
+    noiseAmplitude: 1
+    noiseFrequency: 1
+    noiseSpeed: 0
+    shapeCutOffSpeed: 0
+    shapeCutOffRadius: 10
     m_LocalIntensity: 0.008
     lensFlareTexture: {fileID: 2800000, guid: da47326d6c6190a4e8793de9a26bf176, type: 3}
     uniformScale: 2
@@ -1254,9 +1303,9 @@ MonoBehaviour:
     m_Count: 3
     preserveAspectRatio: 0
     rotation: 0
-    tintConst: 1
+    tintColorType: 0
     tint: {r: 0.34509802, g: 1, b: 0.7484353, a: 0.5}
-    tintRadial:
+    tintGradient:
       <textureSize>k__BackingField: 4
       m_Gradient:
         serializedVersion: 2

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs

@@ -2461,7 +2461,7 @@ namespace UnityEngine.Rendering.HighDefinition
                 name: string.Format("{0}_CameraColorBufferMipChain{1}", viewName, frameIndex));
         }
 
-        void ReleaseHistoryBuffer()
+        public void ReleaseHistoryBuffer() //WW1MOD : Make public
         {
             m_HistoryRTSystem.ReleaseAll();
 

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/FSR/Runtime/FSR2/Fsr2Context.cs

@@ -266,8 +266,8 @@ namespace FidelityFX.FSR2
 
                 // Dispatch RCAS
                 const int threadGroupWorkRegionDimRcas = 16;
-                int threadGroupsX = (Screen.width + threadGroupWorkRegionDimRcas - 1) / threadGroupWorkRegionDimRcas;
-                int threadGroupsY = (Screen.height + threadGroupWorkRegionDimRcas - 1) / threadGroupWorkRegionDimRcas;
+                int threadGroupsX = (_contextDescription.DisplaySize.x + threadGroupWorkRegionDimRcas - 1) / threadGroupWorkRegionDimRcas;
+                int threadGroupsY = (_contextDescription.DisplaySize.y + threadGroupWorkRegionDimRcas - 1) / threadGroupWorkRegionDimRcas;
                 _sharpenPass.ScheduleDispatch(commandBuffer, dispatchParams, frameIndex, threadGroupsX, threadGroupsY);
             }
 

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/FSR/Runtime/FSR3/Fsr3UpscalerContext.cs

@@ -185,7 +185,7 @@ namespace FidelityFX.FSR3
 
             // If auto exposure is enabled use the auto exposure SRV, otherwise what the app sends
             if ((_contextDescription.Flags & Fsr3Upscaler.InitializationFlags.EnableAutoExposure) != 0)
-                dispatchParams.Exposure = new ResourceView(_resources.FrameInfo);
+                dispatchParams.Exposure = new ResourceView(_resources.FrameInfo[frameIndex]);
             else if (!dispatchParams.Exposure.IsValid)
                 dispatchParams.Exposure = new ResourceView(_resources.DefaultExposure);
 
@@ -236,8 +236,8 @@ namespace FidelityFX.FSR3
                 commandBuffer.ClearRenderTarget(false, true, Color.clear);
 
                 // Auto exposure always used to track luma changes in locking logic
-                commandBuffer.SetRenderTarget(_resources.FrameInfo);
-                commandBuffer.ClearRenderTarget(false, true, new Color(0f, 1f, 0f, 0f));
+                commandBuffer.SetRenderTarget(_resources.FrameInfo[frameIndex ^ 1]);
+                commandBuffer.ClearRenderTarget(false, true, new Color(0f, 1e8f, 0f, 0f));
 
                 // Reset atomic counter to 0
                 commandBuffer.SetRenderTarget(_resources.SpdAtomicCounter);
@@ -249,6 +249,9 @@ namespace FidelityFX.FSR3
             commandBuffer.SetRenderTarget(_resources.ReconstructedPrevNearestDepth);
             commandBuffer.ClearRenderTarget(false, true, depthInverted ? Color.clear : Color.white);
 
+            commandBuffer.SetRenderTarget(Fsr3ShaderIDs.UavNewLocks);
+            commandBuffer.ClearRenderTarget(false, true, Color.clear);
+
             // Auto exposure
             SetupSpdConstants(dispatchParams, out var dispatchThreadGroupCount);
 

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/FSR/Runtime/FSR3/Fsr3UpscalerPass.cs

@@ -155,9 +155,10 @@ namespace FidelityFX.FSR3
         {
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvCurrentLuma, Resources.Luma[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvFarthestDepth, Fsr3ShaderIDs.UavIntermediate);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvFrameInfo, Resources.FrameInfo[frameIndex ^ 1]);
 
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdAtomicCount, Resources.SpdAtomicCounter);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavFrameInfo, Resources.FrameInfo);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavFrameInfo, Resources.FrameInfo[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip0, Resources.SpdMips, 0);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip1, Resources.SpdMips, 1);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.UavSpdMip2, Resources.SpdMips, 2);
@@ -273,7 +274,7 @@ namespace FidelityFX.FSR3
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvInputExposure, exposure.RenderTarget, exposure.MipLevel, exposure.SubElement);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvDilatedReactiveMasks, Fsr3ShaderIDs.UavDilatedReactiveMasks);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvDilatedMotionVectors, Resources.DilatedVelocity);
-            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvFrameInfo, Resources.FrameInfo);
+            commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvFrameInfo, Resources.FrameInfo[frameIndex]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvLumaHistory, Resources.LumaHistory[frameIndex ^ 1]);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvFarthestDepthMip1, Fsr3ShaderIDs.UavFarthestDepthMip1);
             commandBuffer.SetComputeTextureParam(ComputeShader, KernelIndex, Fsr3ShaderIDs.SrvCurrentLuma, Resources.Luma[frameIndex]);

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/FSR/Runtime/FSR3/Fsr3UpscalerResources.cs

@@ -40,10 +40,10 @@ namespace FidelityFX.FSR3
         public RenderTexture DilatedVelocity;
         public RenderTexture DilatedDepth;
         public RenderTexture ReconstructedPrevNearestDepth;
-        public RenderTexture FrameInfo;
         public RenderTexture AutoReactive;
         public RenderTexture AutoComposition;
 
+        public readonly RenderTexture[] FrameInfo = new RenderTexture[2];
         public readonly RenderTexture[] Accumulation = new RenderTexture[2];
         public readonly RenderTexture[] Luma = new RenderTexture[2];
         public readonly RenderTexture[] InternalUpscaled = new RenderTexture[2];
@@ -107,8 +107,7 @@ namespace FidelityFX.FSR3
             ReconstructedPrevNearestDepth.Create();
 
             // Resource FSR3UPSCALER_FrameInfo: FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R32G32B32A32_FLOAT, FFX_RESOURCE_FLAGS_NONE
-            FrameInfo = new RenderTexture(1, 1, 0, GraphicsFormat.R32G32B32A32_SFloat) { name = "FSR3UPSCALER_FrameInfo", enableRandomWrite = true };
-            FrameInfo.Create();
+            CreateDoubleBufferedResource(FrameInfo, "FSR3UPSCALER_FrameInfo", Vector2Int.one, GraphicsFormat.R32G32B32A32_SFloat);
 
             // Resources FSR3UPSCALER_Accumulation1/2: FFX_RESOURCE_USAGE_RENDERTARGET | FFX_RESOURCE_USAGE_UAV, FFX_SURFACE_FORMAT_R8_UNORM, FFX_RESOURCE_FLAGS_NONE
             CreateDoubleBufferedResource(Accumulation, "FSR3UPSCALER_Accumulation", maxRenderSize, GraphicsFormat.R8_UNorm);
@@ -194,8 +193,8 @@ namespace FidelityFX.FSR3
             DestroyResource(InternalUpscaled);
             DestroyResource(Luma);
             DestroyResource(Accumulation);
+            DestroyResource(FrameInfo);
 
-            DestroyResource(ref FrameInfo);
             DestroyResource(ref ReconstructedPrevNearestDepth);
             DestroyResource(ref DilatedDepth);
             DestroyResource(ref DilatedVelocity);

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/FSR/Shaders/shaders/ffx_fsr3upscaler_luma_pyramid_pass.hlsl

@@ -22,6 +22,7 @@
 
 #define FSR3UPSCALER_BIND_SRV_CURRENT_LUMA                    0
 #define FSR3UPSCALER_BIND_SRV_FARTHEST_DEPTH                  1
+#define FSR3UPSCALER_BIND_SRV_FRAME_INFO                      2
 
 #define FSR3UPSCALER_BIND_UAV_SPD_GLOBAL_ATOMIC               0
 #define FSR3UPSCALER_BIND_UAV_FRAME_INFO                      1

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/FSR/Shaders/shaders/fsr3upscaler/ffx_fsr3upscaler_accumulate.h

@@ -169,5 +169,5 @@ void Accumulate(FfxInt32x2 iPxHrPos)
 #if FFX_FSR3UPSCALER_OPTION_APPLY_SHARPENING == 0
     StoreUpscaledOutput(iPxHrPos, data.fHistoryColor);
 #endif
-    StoreNewLocks(iPxHrPos, 0);
+    //StoreNewLocks(iPxHrPos, 0);
 }

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/FSR/Shaders/shaders/fsr3upscaler/ffx_fsr3upscaler_luma_pyramid.h

@@ -95,7 +95,7 @@ void SpdStore(FfxInt32x2 pix, FfxFloat32x4 outValue, FfxUInt32 index, FfxUInt32
 
         if (all(FFX_EQUAL(pix, FfxInt32x2(0, 0))))
         {
-            FfxFloat32x4 frameInfo          = LoadFrameInfo();
+            FfxFloat32x4 frameInfo          = FrameInfo();
             const FfxFloat32 fSceneAvgLuma  = outValue[LUMA];
             const FfxFloat32 fPrevLogLuma   = frameInfo[FRAME_INFO_LOG_LUMA];
             FfxFloat32 fLogLuma             = outValue[LOG_LUMA];

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using FidelityFX;
 using FidelityFX.FSR2;
+using UnityEngine.Experimental.Rendering;
 
 namespace UnityEngine.Rendering.HighDefinition.AMD.FSR2
 {
@@ -63,6 +64,8 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR2
         private readonly Fsr2.DispatchDescription _dispatchDescription = new();
         private readonly FSR2CommandInitializationData _initData;
 
+        private Texture2DArray _clearTextureArray;
+
         internal FSR2UpscalerContext(in FSR2CommandInitializationData initSettings)
         {
             _initData = initSettings;
@@ -88,21 +91,30 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR2
                 Flags = flags,
                 Shaders = assets.shaders,
             });
+
+            _clearTextureArray = new Texture2DArray(1, 1, TextureXR.slices, GraphicsFormat.R32G32_SFloat, TextureCreationFlags.None);
+            for (int i = 0; i < TextureXR.slices; ++i) _clearTextureArray.SetPixels(new[] { Color.clear, }, i);
+            _clearTextureArray.Apply();
         }
 
         internal void Destroy()
         {
+            CoreUtils.Destroy(_clearTextureArray);
+
             _context.Destroy();
         }
 
         public override void Execute(CommandBuffer cmd, in FSR2CommandExecutionData executeData, in FSR2TextureTable textures)
         {
+            bool useTextureArrays = TextureXR.useTexArray && textures.colorInput.dimension == TextureDimension.Tex2DArray;
+            ResourceView clearTexture = useTextureArrays ? new ResourceView(_clearTextureArray) : new ResourceView();
+
             _dispatchDescription.Color = new ResourceView(textures.colorInput);
             _dispatchDescription.Depth = new ResourceView(textures.depth);
             _dispatchDescription.MotionVectors = new ResourceView(textures.motionVectors);
-            _dispatchDescription.Exposure = new ResourceView(textures.exposureTexture);
-            _dispatchDescription.Reactive = new ResourceView(textures.biasColorMask);
-            _dispatchDescription.TransparencyAndComposition = new ResourceView(textures.transparencyMask);
+            _dispatchDescription.Exposure = textures.exposureTexture != null ? new ResourceView(textures.exposureTexture) : new ResourceView();
+            _dispatchDescription.Reactive = textures.biasColorMask != null ? new ResourceView(textures.biasColorMask) : clearTexture;
+            _dispatchDescription.TransparencyAndComposition = textures.transparencyMask != null ? new ResourceView(textures.transparencyMask) : clearTexture;
             _dispatchDescription.Output = new ResourceView(textures.colorOutput);
 
             _dispatchDescription.JitterOffset = new Vector2(executeData.jitterOffsetX, executeData.jitterOffsetY);
@@ -118,7 +130,7 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR2
             _dispatchDescription.CameraFar = executeData.cameraFar;
             _dispatchDescription.CameraFovAngleVertical = executeData.cameraFovAngleVertical;
             _dispatchDescription.ViewSpaceToMetersFactor = 1.0f; // 1 unit is 1 meter in Unity
-            _dispatchDescription.UseTextureArrays = TextureXR.useTexArray && textures.colorInput.dimension == TextureDimension.Tex2DArray;
+            _dispatchDescription.UseTextureArrays = useTextureArrays;
 
             _context.Dispatch(_dispatchDescription, cmd);
         }

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

@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using FidelityFX;
 using FidelityFX.FSR3;
+using UnityEngine.Experimental.Rendering;
+#if UNITY_STANDALONE_WIN
+using AMDUP = UnityEngine.AMD;
+#endif
 
 namespace UnityEngine.Rendering.HighDefinition.AMD.FSR3
 {
@@ -13,6 +18,7 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR3
         public static bool EnableDebugView { get; set; } = false;
 
         private Fsr3UpscalerAssets _assets;
+        private bool _nativePluginLoaded;
 
         public override string name => "FSR 3.1";
 
@@ -20,10 +26,33 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR3
 
         public override bool includesSharpening => true;
 
-        public override bool supportsAlpha => true;
+        public override bool supportsAlpha => !_nativePluginLoaded; // Managed Unity port has alpha upscaling built-in, the native AMD implementation doesn't
 
         public override bool Load()
         {
+            // Guess we're using native plugins after all!
+            // On Windows with supported graphics APIs, we use a drop-in replacement for Unity's plugin that implements FSR 3.1 through AMD's upgradable FidelityFX API.
+            // This allows AMD's GPU driver to hijack the plugin and transparently upgrade our implementation to FSR4 on supported graphics cards!
+            _nativePluginLoaded = false;
+#if UNITY_STANDALONE_WIN
+            if (!Application.isEditor && SystemInfo.operatingSystemFamily == OperatingSystemFamily.Windows && SystemInfo.graphicsDeviceType is GraphicsDeviceType.Direct3D12 or GraphicsDeviceType.Vulkan)
+            {
+                try
+                {
+                    if (AMDUP.AMDUnityPlugin.IsLoaded() || AMDUP.AMDUnityPlugin.Load())
+                    {
+                        _nativePluginLoaded = AMDUP.GraphicsDevice.device != null || AMDUP.GraphicsDevice.CreateGraphicsDevice() != null;
+                        if (_nativePluginLoaded)
+                            return true;
+                    }
+                }
+                catch (DllNotFoundException)
+                {
+                    _nativePluginLoaded = false;
+                }
+            }
+#endif
+
             if (_assets != null)
                 return true;
 
@@ -31,18 +60,39 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR3
             return _assets != null;
         }
 
-        public override bool IsLoaded() => _assets != null;
+        public override bool IsLoaded() => _nativePluginLoaded || _assets != null;
 
         public override UpscalerContext CreateContext(in FSR2CommandInitializationData initSettings)
         {
-            var context = new FSR3UpscalerContext(in initSettings);
-            context.Init(_assets);
-            return context;
+#if UNITY_STANDALONE_WIN
+            if (_nativePluginLoaded)
+            {
+                var context = new FSR3NativeUpscalerContext(in initSettings);
+                context.Init();
+                return context;
+            }
+            else
+#endif
+            {
+                var context = new FSR3UpscalerContext(in initSettings);
+                context.Init(_assets);
+                return context;
+            }
         }
 
         public override void DestroyContext(UpscalerContext context)
         {
-            ((FSR3UpscalerContext)context).Destroy();
+            switch (context)
+            {
+#if UNITY_STANDALONE_WIN
+                case FSR3NativeUpscalerContext nativeContext:
+                    nativeContext.Destroy();
+                    break;
+#endif
+                case FSR3UpscalerContext managedContext:
+                    managedContext.Destroy();
+                    break;
+            }
         }
 
         public override bool GetRenderResolutionFromQualityMode(FSR2Quality qualityMode, uint displayWidth, uint displayHeight, out uint renderWidth, out uint renderHeight)
@@ -65,6 +115,8 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR3
         private readonly Fsr3Upscaler.DispatchDescription _dispatchDescription = new();
         private readonly FSR2CommandInitializationData _initData;
 
+        private Texture2DArray _clearTextureArray;
+
         internal FSR3UpscalerContext(in FSR2CommandInitializationData initSettings)
         {
             _initData = initSettings;
@@ -90,21 +142,30 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR3
                 Flags = flags,
                 Shaders = assets.shaders,
             });
+
+            _clearTextureArray = new Texture2DArray(1, 1, TextureXR.slices, GraphicsFormat.R32G32_SFloat, TextureCreationFlags.None);
+            for (int i = 0; i < TextureXR.slices; ++i) _clearTextureArray.SetPixels(new[] { Color.clear, }, i);
+            _clearTextureArray.Apply();
         }
 
         internal void Destroy()
         {
+            CoreUtils.Destroy(_clearTextureArray);
+
             _context.Destroy();
         }
 
         public override void Execute(CommandBuffer cmd, in FSR2CommandExecutionData executeData, in FSR2TextureTable textures)
         {
+            bool useTextureArrays = TextureXR.useTexArray && textures.colorInput.dimension == TextureDimension.Tex2DArray;
+            ResourceView clearTexture = useTextureArrays ? new ResourceView(_clearTextureArray) : new ResourceView();
+
             _dispatchDescription.Color = new ResourceView(textures.colorInput);
             _dispatchDescription.Depth = new ResourceView(textures.depth);
             _dispatchDescription.MotionVectors = new ResourceView(textures.motionVectors);
-            _dispatchDescription.Exposure = new ResourceView(textures.exposureTexture);
-            _dispatchDescription.Reactive = new ResourceView(textures.biasColorMask);
-            _dispatchDescription.TransparencyAndComposition = new ResourceView(textures.transparencyMask);
+            _dispatchDescription.Exposure = textures.exposureTexture != null ? new ResourceView(textures.exposureTexture) : new ResourceView();
+            _dispatchDescription.Reactive = textures.biasColorMask != null ? new ResourceView(textures.biasColorMask) : clearTexture;
+            _dispatchDescription.TransparencyAndComposition = textures.transparencyMask != null ? new ResourceView(textures.transparencyMask) : clearTexture;
             _dispatchDescription.Output = new ResourceView(textures.colorOutput);
 
             _dispatchDescription.JitterOffset = new Vector2(executeData.jitterOffsetX, executeData.jitterOffsetY);
@@ -122,9 +183,85 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.FSR3
             _dispatchDescription.CameraFovAngleVertical = executeData.cameraFovAngleVertical;
             _dispatchDescription.ViewSpaceToMetersFactor = 1.0f; // 1 unit is 1 meter in Unity
             _dispatchDescription.Flags = FSR3UpscalerPlugin.EnableDebugView ? Fsr3Upscaler.DispatchFlags.DrawDebugView : 0;
-            _dispatchDescription.UseTextureArrays = TextureXR.useTexArray && textures.colorInput.dimension == TextureDimension.Tex2DArray;
+            _dispatchDescription.UseTextureArrays = useTextureArrays;
 
             _context.Dispatch(_dispatchDescription, cmd);
         }
     }
+
+#if UNITY_STANDALONE_WIN
+    public class FSR3NativeUpscalerContext : UpscalerContext
+    {
+        private AMDUP.FSR2Context _nativeContext;
+        private readonly FSR2CommandInitializationData _initData;
+
+        internal FSR3NativeUpscalerContext(in FSR2CommandInitializationData initSettings)
+        {
+            _initData = initSettings;
+        }
+
+        internal void Init()
+        {
+            AMDUP.FSR2CommandInitializationData initSettings = new()
+            {
+                maxRenderSizeWidth = _initData.maxRenderSizeWidth,
+                maxRenderSizeHeight = _initData.maxRenderSizeHeight,
+                displaySizeWidth = _initData.displaySizeWidth,
+                displaySizeHeight = _initData.displaySizeHeight,
+                ffxFsrFlags = (AMDUP.FfxFsr2InitializationFlags)_initData.ffxFsrFlags,
+            };
+
+            CommandBuffer cmd = new();
+            _nativeContext = AMDUP.GraphicsDevice.device.CreateFeature(cmd, in initSettings);
+            Graphics.ExecuteCommandBuffer(cmd);
+            cmd.Release();
+        }
+
+        internal void Destroy()
+        {
+            if (_nativeContext == null)
+                return;
+
+            CommandBuffer cmd = new();
+            AMDUP.GraphicsDevice.device.DestroyFeature(cmd, _nativeContext);
+            Graphics.ExecuteCommandBuffer(cmd);
+            cmd.Release();
+
+            _nativeContext = null;
+        }
+
+        public override void Execute(CommandBuffer cmd, in FSR2CommandExecutionData executeData, in FSR2TextureTable textures)
+        {
+            ref var execData = ref _nativeContext.executeData;
+            execData.jitterOffsetX = executeData.jitterOffsetX;
+            execData.jitterOffsetY = executeData.jitterOffsetY;
+            execData.MVScaleX = executeData.MVScaleX;
+            execData.MVScaleY = executeData.MVScaleY;
+            execData.renderSizeWidth = executeData.renderSizeWidth;
+            execData.renderSizeHeight = executeData.renderSizeHeight;
+            execData.enableSharpening = executeData.enableSharpening;
+            execData.sharpness = executeData.sharpness;
+            execData.frameTimeDelta = executeData.frameTimeDelta;
+            execData.preExposure = executeData.preExposure;
+            execData.reset = executeData.reset;
+            execData.cameraNear = executeData.cameraNear;
+            execData.cameraFar = executeData.cameraFar;
+            execData.cameraFovAngleVertical = executeData.cameraFovAngleVertical;
+
+            AMDUP.FSR2TextureTable textureTable = new()
+            {
+                colorInput = textures.colorInput,
+                depth = textures.depth,
+                motionVectors = textures.motionVectors,
+                exposureTexture = textures.exposureTexture,
+                biasColorMask = textures.biasColorMask,
+                reactiveMask = textures.reactiveMask,
+                transparencyMask = textures.transparencyMask,
+                colorOutput = textures.colorOutput,
+            };
+
+            AMDUP.GraphicsDevice.device.ExecuteFSR2(cmd, _nativeContext, in textureTable);
+        }
+    }
+#endif
 }

Packages/com.unity.ugui/Tests/Editor/TMP/Unity.TextMeshPro.Editor.Tests.asmdef

@@ -1,17 +1,27 @@
 {
     "name": "Unity.TextMeshPro.Editor.Tests",
+    "rootNamespace": "",
     "references": [
         "Unity.TextMeshPro",
-        "Unity.TextMeshPro.Editor"
+        "Unity.TextMeshPro.Editor",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner"
     ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
-    ],
-	"defineConstraints": [
-	"UNITY_INCLUDE_TESTS"
-	],
     "includePlatforms": [
         "Editor"
     ],
-    "excludePlatforms": []
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS",
+        "UNITY_INCLUDE_TESTS",
+        "UGUI_TESTS_ENABLED"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Packages/com.unity.ugui/Tests/Editor/UGUI/UI/PropertyDrawers/PropertyDrawerTests.cs

@@ -51,7 +51,7 @@ public class PropertyDrawerTests
     static PropertyDrawerTestsWindow window;
 
     [UnitySetUp]
-    [MenuItem("Tests/Open Property Drawer Test Window")]
+    // WW1MOD: Disabled this menu item [MenuItem("Tests/Open Property Drawer Test Window")]
     public static IEnumerator SetUp()
     {
         VisualTreeBindingsUpdater.disableBindingsThrottling = true;

Packages/com.unity.ugui/Tests/Editor/UGUI/UnityEditor.UI.EditorTests.asmdef

@@ -1,14 +1,26 @@
 {
     "name": "UnityEditor.UI.EditorTests",
+    "rootNamespace": "",
     "references": [
         "UnityEditor.UI",
-        "UnityEngine.UI"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "UnityEngine.UI",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner"
     ],
     "includePlatforms": [
         "Editor"
     ],
-    "excludePlatforms": []
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS",
+        "UGUI_TESTS_ENABLED"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Packages/com.unity.ugui/Tests/Runtime/TMP/Unity.TextMeshPro.Tests.asmdef

@@ -1,14 +1,24 @@
 {
     "name": "Unity.TextMeshPro.Tests",
+    "rootNamespace": "",
     "references": [
-        "Unity.TextMeshPro"
+        "Unity.TextMeshPro",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner"
     ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
-    ],
-	"defineConstraints": [
-	"UNITY_INCLUDE_TESTS"
-	],
     "includePlatforms": [],
-    "excludePlatforms": []
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS",
+        "UNITY_INCLUDE_TESTS",
+        "UGUI_TESTS_ENABLED"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Packages/com.unity.ugui/Tests/Runtime/UGUI/UnityEngine.UI.Tests.asmdef

@@ -1,5 +1,6 @@
 {
     "name": "UnityEngine.UI.Tests",
+    "rootNamespace": "",
     "references": [
         "UnityEngine.UI",
         "UnityEngine.TestRunner",
@@ -14,7 +15,8 @@
     ],
     "autoReferenced": false,
     "defineConstraints": [
-        "UNITY_INCLUDE_TESTS"
+        "UNITY_INCLUDE_TESTS",
+        "UGUI_TESTS_ENABLED"
     ],
     "versionDefines": [
         {