Merge remote-tracking branch 'upstream/master' into pr/2760

Author: dave-juicelabs

CHANGELOG.md

@@ -1,5 +1,58 @@
 # Change Log
 
+## 2.12
+
+### Features
+
+- Implement support for NVIDIA Reflex through `VK_NV_low_latency2`. Thanks to NVIDIA for contributing implementation
+- Implement D3D12 render pass API (tier 0)
+- Implement ID3D12DeviceRemovedExtendedDataSettings stubs. Fixes some games that rely on this existing
+- Implement `VK_EXT_device_fault`. Makes it possible to grab fault information and vendor binary if supported
+- Implement `VK_EXT_swapchain_maintenance1`
+  - Allows seamless transition between V-Sync and tearing present modes without stutter
+  - Implemented on both Mesa and NV drivers
+- Expose Shader Model 6.7 by default if
+  `VK_KHR_shader_maximal_reconvergence` and `VK_KHR_shader_quad_control` are supported
+- Add optimized descriptor copy path on Intel Arc GPUs that support `VK_EXT_descriptor_buffer`
+- Implement fallback for compute shader derivatives on NVIDIA Pascal and older GPUs.
+  Allows exposing Shader Model 6.7 by default on Pascal as well (albeit with some known cases where it does not work).
+  The workaround is expected to work with any known use of SM 6.6 compute derivatives in the wild
+
+### Fixes
+
+- Fix Atlas Fallen black screen due to edge case with MinLODClamp
+- Correctly disable alpha-to-coverage if sampler mask is exported
+- Fix format feature reports for `DXGI_FORMAT_UNKNOWN`
+- Relax root signature compatibility rules when compiling Ray Tracing pipelines.
+  Fixes GPU hang on NV in Warhammer: Darktide
+- Fix GPU hang on NV in UE5 Lyra demo
+- Explicitly validate stage IO signatures in PSO creation similar to native D3D12 runtime.
+  Fixes some scenarios where a game attempts to create an invalid pipeline that should have failed creation
+  on native D3D12
+
+### Workarounds
+
+- Workaround crash in Resident Evil 4 RT mode when tessellation is enabled
+- Workaround mesh shader glitches on NVIDIA in several UE5 titles
+- Workaround GPU hang on NVIDIA in World of Warcraft when MSAA is enabled
+- Disable RT by default in Persona 3 Reload on Deck
+
+### Performance
+
+- Implement `VK_NV_raw_access_chains`. Significantly improves GPU performance on NV GPUs in some games.
+  Games using DXBC instead of DXIL are expected to see more improvements.
+  Not all games are expected to see an uplift
+- Fix extremely poor GPU performance in some locations in Persona 3 Reload
+
+### Debug
+
+- Add support for `VKD3D_QUEUE_PROFILE`, a simple system profiling method
+  - Includes `VK_NV_low_latency2` support to debug NVIDIA Reflex sleeps
+- Root signature blobs are also dumped when dumping shaders
+  - A simple CLI tool to inspect the root-sig blobs is included in `programs/`
+- Misc improvements to breadcrumbs, debug ring, etc
+- Pipeline creation failure now dumps PSO creation commands in log
+
 ## 2.11.1
 
 This release is a minor bug-fix release before the holidays.

VP_D3D12_VKD3D_PROTON_profile.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://schema.khronos.org/vulkan/profiles-0.8.1-250.json#",
+    "$schema": "https://schema.khronos.org/vulkan/profiles-0.8-latest.json#",
     "capabilities": {
         "baseline_features": {
             "extensions": {
@@ -176,7 +176,8 @@
                 "VK_KHR_fragment_shading_rate": 1,
                 "VK_EXT_pipeline_library_group_handles": 1,
                 "VK_KHR_ray_tracing_maintenance1": 1,
-                "VK_EXT_mesh_shader": 1
+                "VK_EXT_mesh_shader": 1,
+                "VK_EXT_conservative_rasterization": 1
             },
             "formats": {
                 "VK_FORMAT_R32G32_SFLOAT": {
@@ -447,6 +448,20 @@
                 }
             }
         },
+        "shader_model_67": {
+            "extensions": {
+                "VK_KHR_shader_maximal_reconvergence": 1,
+                "VK_KHR_shader_quad_control": 1
+            },
+            "features": {
+                "VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR": {
+                    "shaderMaximalReconvergence": true
+                },
+                "VkPhysicalDeviceShaderQuadControlFeaturesKHR": {
+                    "shaderQuadControl": true
+                }
+            }
+        },
         "optimal_performance": {
             "extensions": {
                 "VK_EXT_descriptor_buffer": 1,
@@ -458,7 +473,8 @@
                 "VK_EXT_graphics_pipeline_library": 1,
                 "VK_KHR_pipeline_library": 1,
                 "VK_AMD_buffer_marker": 1,
-                "VK_EXT_scalar_block_layout": 1
+                "VK_EXT_scalar_block_layout": 1,
+                "VK_EXT_swapchain_maintenance1" : 1
             },
             "features": {
                 "VkPhysicalDeviceDescriptorBufferFeaturesEXT": {
@@ -489,6 +505,9 @@
                 },
                 "VkPhysicalDeviceScalarBlockLayoutFeaturesEXT": {
                     "scalarBlockLayout": true
+                },
+                "VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT": {
+                    "swapchainMaintenance1": true
                 }
             },
             "properties": {
@@ -551,14 +570,18 @@
                 "VK_AMD_device_coherent_memory": 1,
                 "VK_AMD_shader_core_properties": 1,
                 "VK_AMD_shader_core_properties2": 1,
-                "VK_EXT_dynamic_rendering_unused_attachments": 1
+                "VK_EXT_dynamic_rendering_unused_attachments": 1,
+                "VK_EXT_image_compression_control": 1
             },
             "features": {
                 "VkPhysicalDeviceCoherentMemoryFeaturesAMD": {
                     "deviceCoherentMemory": true
                 },
                 "VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT": {
                     "dynamicRenderingUnusedAttachments": true
+                },
+                "VkPhysicalDeviceImageCompressionControlFeaturesEXT": {
+                    "imageCompressionControl": true
                 }
             },
             "properties": {
@@ -580,11 +603,15 @@
                 "VK_NV_shader_sm_builtins": 1,
                 "VK_NVX_binary_import": 1,
                 "VK_NVX_image_view_handle": 1,
-                "VK_NV_device_diagnostic_checkpoints": 1
+                "VK_NV_device_diagnostic_checkpoints": 1,
+                "VK_NV_raw_access_chains": 1
             },
             "features": {
                 "VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT": {
                     "pageableDeviceLocalMemory": true
+                },
+                "VkPhysicalDeviceRawAccessChainsFeaturesNV": {
+                    "shaderRawAccessChains": true
                 }
             },
             "properties": {
@@ -724,6 +751,7 @@
                 "fl_12_2_properties",
                 "shader_model_60",
                 "shader_model_66",
+                "shader_model_67",
                 "optimal_performance",
                 "optional",
                 "optional_amd"
@@ -745,6 +773,7 @@
                 "fl_12_2_properties",
                 "shader_model_60",
                 "shader_model_66",
+                "shader_model_67",
                 "optimal_performance",
                 "optional",
                 "optional_nv"
@@ -756,6 +785,12 @@
         "Hans-Kristian Arntzen": { "company": "Valve" }
     },
     "history": [
+        {
+            "revision": 2,
+            "date": "2024-02-09",
+            "author": "Hans-Kristian Arntzen",
+            "comment": "Add SM 6.7"
+        },
         {
             "revision": 1,
             "date": "2023-05-23",

include/meson.build

@@ -13,6 +13,7 @@ vkd3d_idl = [
   'vkd3d_dxgitype.idl',
   'vkd3d_swapchain_factory.idl',
   'vkd3d_command_list_vkd3d_ext.idl',
+  'vkd3d_command_queue_vkd3d_ext.idl',
   'vkd3d_device_vkd3d_ext.idl',
   'vkd3d_core_interface.idl',
 ]

include/private/vkd3d_common.h

@@ -332,7 +332,7 @@ static inline uint64_t vkd3d_get_current_time_ticks(void)
 {
 #ifdef _MSC_VER
     return __rdtsc();
-#elif defined(__i386__) || defined(__x86_64__)
+#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
     return __builtin_ia32_rdtsc();
 #else
     return vkd3d_get_current_time_ns();

include/private/vkd3d_debug.h

@@ -69,6 +69,7 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(enum vkd3d_dbg_channel channel);
 
 void vkd3d_dbg_printf(enum vkd3d_dbg_channel channel, enum vkd3d_dbg_level level, const char *function,
         const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5);
+void vkd3d_dbg_flush(void);
 
 const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2);
 const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args);

include/private/vkd3d_string.h

@@ -88,17 +88,31 @@ static inline void vkd3d_strlcpy(char *dst, size_t dst_size, const char *src)
 {
     if (dst_size > 0)
     {
-        strncpy(dst, src, dst_size - 1);
-        dst[dst_size - 1] = '\0';
+        if (strlen(src) < dst_size)
+        {
+            strcpy(dst, src);
+        }
+        else
+        {
+            memcpy(dst, src, dst_size - 1);
+            dst[dst_size - 1] = '\0';
+        }
     }
 }
 
 static inline void vkd3d_strlcat(char *dst, size_t dst_size, const char *src)
 {
+    char *dst_begin;
+    size_t dst_len;
+    char *dst_end;
+
     if (dst_size > 0)
     {
-        strncat(dst, src, dst_size - 1);
-        dst[dst_size - 1] = '\0';
+        dst_begin = dst + strlen(dst);
+        dst_end = dst + dst_size;
+        assert(dst_end >= dst_begin);
+        dst_len = dst_end - dst_begin;
+        vkd3d_strlcpy(dst_begin, dst_len, src);
     }
 }
 

include/shader-debug/debug_channel.h

@@ -267,72 +267,84 @@ void DEBUG_CHANNEL_MSG_UNIFORM(uint v0)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(uint v0, uint v1)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(uint v0, uint v1, uint v2)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1, v2);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(uint v0, uint v1, uint v2, uint v3)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1, v2, v3);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(int v0)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(int v0, int v1)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(int v0, int v1, int v2)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1, v2);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(int v0, int v1, int v2, int v3)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1, v2, v3);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(float v0)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(float v0, float v1)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(float v0, float v1, float v2)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1, v2);
+    subgroupBarrier();
 }
 
 void DEBUG_CHANNEL_MSG_UNIFORM(float v0, float v1, float v2, float v3)
 {
     if (DEBUG_CHANNEL_ELECT())
         DEBUG_CHANNEL_MSG(v0, v1, v2, v3);
+    subgroupBarrier();
 }
 
 #endif

include/vkd3d.h

@@ -63,13 +63,13 @@ extern "C" {
 #define VKD3D_CONFIG_FLAG_SINGLE_QUEUE (1ull << 5)
 #define VKD3D_CONFIG_FLAG_DESCRIPTOR_QA_CHECKS (1ull << 6)
 #define VKD3D_CONFIG_FLAG_NO_DXR (1ull << 7)
-/* Bit 8 is vacant */
+#define VKD3D_CONFIG_FLAG_FAULT (1ull << 8)
 #define VKD3D_CONFIG_FLAG_FORCE_MINIMUM_SUBGROUP_SIZE (1ull << 9)
 #define VKD3D_CONFIG_FLAG_NO_UPLOAD_HVV (1ull << 10)
 #define VKD3D_CONFIG_FLAG_LOG_MEMORY_BUDGET (1ull << 11)
-/* Bit 12 is vacant */
+#define VKD3D_CONFIG_FLAG_BREADCRUMBS_SYNC (1ull << 12)
 #define VKD3D_CONFIG_FLAG_FORCE_HOST_CACHED (1ull << 13)
-/* Bit 14 is vacant */
+#define VKD3D_CONFIG_FLAG_APP_DEBUG_MARKER_ONLY (1ull << 14)
 #define VKD3D_CONFIG_FLAG_FORCE_NO_INVARIANT_POSITION (1ull << 15)
 #define VKD3D_CONFIG_FLAG_GLOBAL_PIPELINE_CACHE (1ull << 16)
 #define VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_NO_SERIALIZE_SPIRV (1ull << 17)

include/vkd3d_command_queue_vkd3d_ext.idl

@@ -0,0 +1,30 @@
+/*
+ * * Copyright 2023 NVIDIA Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+import "vkd3d_d3d12.idl";
+import "vkd3d_vk_includes.h";
+
+[
+    uuid(40ed3f96-e773-e9bc-fc0c-e95560c99ad6),
+    object,
+    local,
+    pointer_default(unique)
+]
+interface ID3D12CommandQueueExt : IUnknown
+{
+    HRESULT NotifyOutOfBandCommandQueue(D3D12_OUT_OF_BAND_CQ_TYPE type);
+}

include/vkd3d_device_vkd3d_ext.idl

@@ -54,3 +54,18 @@ interface ID3D12DXVKInteropDevice : IUnknown
     HRESULT LockCommandQueue(ID3D12CommandQueue *queue);
     HRESULT UnlockCommandQueue(ID3D12CommandQueue *queue);
 }
+
+[
+    uuid(f3112584-41f9-348d-a59b-00b7e1d285d6),
+    object,
+    local,
+    pointer_default(unique)
+]
+interface ID3DLowLatencyDevice : IUnknown
+{
+    BOOL SupportsLowLatency();
+    HRESULT LatencySleep();
+    HRESULT SetLatencySleepMode(BOOL low_latency_mode, BOOL low_latency_boost, UINT32 minimum_interval_us);
+    HRESULT SetLatencyMarker(UINT64 frameID, UINT32 markerType);
+    HRESULT GetLatencyInfo(D3D12_LATENCY_RESULTS *latency_results);
+}