Implement support for NV diagnostics extensions

* These are treated as read-only, we replay checkpoints but they are for
  aftermath so don't mean anything.
* This allows applications to leave aftermath on, normally this could be
  silently allowed but aftermath affects shader compilation when enabled.

Author: baldurk

renderdoc/driver/vulkan/extension_support.md

@@ -258,6 +258,8 @@ Maintainers can update this file by updating vk.xml in this folder and running `
 * `VK_MVK_macos_surface`
 * `VK_NV_compute_shader_derivatives`
 * `VK_NV_dedicated_allocation`
+* `VK_NV_device_diagnostic_checkpoints`
+* `VK_NV_device_diagnostics_config`
 * `VK_NV_external_memory_capabilities`
 * `VK_NV_external_memory_win32`
 * `VK_NV_external_memory`
@@ -427,8 +429,6 @@ The portability subset is only relevant on mac, which is not a supported platfor
 * `VK_NV_cuda_kernel_launch`
 * `VK_NV_dedicated_allocation_image_aliasing`
 * `VK_NV_descriptor_pool_overallocation`
-* `VK_NV_device_diagnostic_checkpoints`
-* `VK_NV_device_diagnostics_config`
 * `VK_NV_device_generated_commands_compute`
 * `VK_NV_device_generated_commands`
 * `VK_NV_displacement_micromap`

renderdoc/driver/vulkan/vk_common.h

@@ -2037,6 +2037,14 @@ static const VkExtensionProperties supportedExtensions[] = {
         VK_NV_COMPUTE_SHADER_DERIVATIVES_EXTENSION_NAME,
         VK_NV_COMPUTE_SHADER_DERIVATIVES_SPEC_VERSION,
     },
+    {
+        VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_EXTENSION_NAME,
+        VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_SPEC_VERSION,
+    },
+    {
+        VK_NV_DEVICE_DIAGNOSTICS_CONFIG_EXTENSION_NAME,
+        VK_NV_DEVICE_DIAGNOSTICS_CONFIG_SPEC_VERSION,
+    },
     {
         VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME,
         VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION,
@@ -4951,6 +4959,9 @@ bool WrappedVulkan::ProcessChunk(ReadSerialiser &ser, VulkanChunk chunk)
       return Serialise_SetCommandAnnotation(ser, VK_NULL_HANDLE, rdcstr(), eRENDERDOC_AnnotationMax,
                                             0, RENDERDOC_AnnotationValue());
 
+    case VulkanChunk::vkCmdSetCheckpointNV:
+      return Serialise_vkCmdSetCheckpointNV(ser, VK_NULL_HANDLE, NULL);
+
     // chunks that are reserved but not yet serialised
     case VulkanChunk::vkResetCommandPool:
     case VulkanChunk::vkCreateDepthTargetView:

renderdoc/driver/vulkan/vk_core.cpp

@@ -3370,4 +3370,12 @@ class WrappedVulkan : public IFrameCapturer
   // VK_EXT_custom_resolve
   IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdBeginCustomResolveEXT, VkCommandBuffer commandBuffer,
                                 const VkBeginCustomResolveInfoEXT *pBeginCustomResolveInfo);
+
+  // VK_NV_device_diagnostic_checkpoints
+  IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetCheckpointNV, VkCommandBuffer commandBuffer,
+                                const void *pCheckpointMarker);
+  void vkGetQueueCheckpointDataNV(VkQueue queue, uint32_t *pCheckpointDataCount,
+                                  VkCheckpointDataNV *pCheckpointData);
+  void vkGetQueueCheckpointData2NV(VkQueue queue, uint32_t *pCheckpointDataCount,
+                                   VkCheckpointData2NV *pCheckpointData);
 };

renderdoc/driver/vulkan/vk_core.h

@@ -560,7 +560,8 @@
   DeclExt(KHR_present_wait2);                          \
   DeclExt(EXT_fragment_density_map_offset);            \
   DeclExt(EXT_image_drm_format_modifier);              \
-  DeclExt(EXT_custom_resolve);
+  DeclExt(EXT_custom_resolve);                         \
+  DeclExt(NV_device_diagnostic_checkpoints);
 
 // for simplicity and since the check itself is platform agnostic,
 // these aren't protected in platform defines
@@ -707,7 +708,8 @@
   CheckExt(KHR_present_wait2, VKXX);                          \
   CheckExt(EXT_fragment_density_map_offset, VKXX);            \
   CheckExt(EXT_image_drm_format_modifier, VKXX);              \
-  CheckExt(EXT_custom_resolve, VKXX);
+  CheckExt(EXT_custom_resolve, VKXX);                         \
+  CheckExt(NV_device_diagnostic_checkpoints, VKXX);
 
 #define HookInitVulkanInstanceExts_PhysDev()                                                         \
   HookInitExtension(KHR_surface, GetPhysicalDeviceSurfaceSupportKHR);                                \
@@ -1113,6 +1115,9 @@
   HookInitExtension(KHR_present_wait2, WaitForPresent2KHR);                                          \
   HookInitExtension(EXT_image_drm_format_modifier, GetImageDrmFormatModifierPropertiesEXT);          \
   HookInitExtension(EXT_custom_resolve, CmdBeginCustomResolveEXT);                                   \
+  HookInitExtension(NV_device_diagnostic_checkpoints, CmdSetCheckpointNV);                           \
+  HookInitExtension(NV_device_diagnostic_checkpoints, GetQueueCheckpointDataNV);                     \
+  HookInitExtension(NV_device_diagnostic_checkpoints, GetQueueCheckpointData2NV);                    \
   HookInitExtension_Device_Win32();                                                                  \
   HookInitExtension_Device_Linux();                                                                  \
   HookInitExtension_Device_Android();                                                                \
@@ -2087,6 +2092,12 @@
               image, VkImageDrmFormatModifierPropertiesEXT *, pProperties);                          \
   HookDefine2(void, vkCmdBeginCustomResolveEXT, VkCommandBuffer, commandBuffer,                      \
               const VkBeginCustomResolveInfoEXT *, pBeginCustomResolveInfo);                         \
+  HookDefine2(void, vkCmdSetCheckpointNV, VkCommandBuffer, commandBuffer, const void *,              \
+              pCheckpointMarker);                                                                    \
+  HookDefine3(void, vkGetQueueCheckpointDataNV, VkQueue, queue, uint32_t *, pCheckpointDataCount,    \
+              VkCheckpointDataNV *, pCheckpointData);                                                \
+  HookDefine3(void, vkGetQueueCheckpointData2NV, VkQueue, queue, uint32_t *, pCheckpointDataCount,   \
+              VkCheckpointData2NV *, pCheckpointData);                                               \
   HookDefine_Win32();                                                                                \
   HookDefine_Linux();                                                                                \
   HookDefine_Android();                                                                              \

renderdoc/driver/vulkan/vk_hookset_defs.h

@@ -124,6 +124,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
               VkBufferOpaqueCaptureAddressCreateInfo);                                               \
   COPY_STRUCT(VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO, VkBufferUsageFlags2CreateInfo);    \
   COPY_STRUCT(VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR, VkCalibratedTimestampInfoKHR);        \
+  COPY_STRUCT(VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV, VkCheckpointDataNV);                             \
+  COPY_STRUCT(VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV, VkCheckpointData2NV);                          \
   COPY_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, VkCommandBufferBeginInfo);                \
   COPY_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT,           \
               VkCommandBufferInheritanceConditionalRenderingInfoEXT);                                \
@@ -152,6 +154,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
   COPY_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT,             \
               VkDescriptorSetVariableDescriptorCountLayoutSupport);                                  \
   COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, VkDeviceCreateInfo);                             \
+  COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV,                            \
+              VkDeviceDiagnosticsConfigCreateInfoNV);                                                \
   COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO, VkDeviceGroupBindSparseInfo);         \
   COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO,                              \
               VkDeviceGroupCommandBufferBeginInfo);                                                  \
@@ -295,6 +299,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
               VkPhysicalDeviceDescriptorIndexingFeatures);                                           \
   COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES,                      \
               VkPhysicalDeviceDescriptorIndexingProperties);                                         \
+  COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV,                      \
+              VkPhysicalDeviceDiagnosticsConfigFeaturesNV);                                          \
   COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT,                    \
               VkPhysicalDeviceDiscardRectanglePropertiesEXT);                                        \
   COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES,                                   \
@@ -709,6 +715,10 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
   COPY_STRUCT(VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO, VkQueryPoolCreateInfo);                      \
   COPY_STRUCT(VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR,                              \
               VkQueryPoolPerformanceCreateInfoKHR);                                                  \
+  COPY_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV,                               \
+              VkQueueFamilyCheckpointPropertiesNV);                                                  \
+  COPY_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV,                             \
+              VkQueueFamilyCheckpointProperties2NV);                                                 \
   COPY_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES,                             \
               VkQueueFamilyGlobalPriorityProperties);                                                \
   COPY_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_OWNERSHIP_TRANSFER_PROPERTIES_KHR,                      \
@@ -1026,8 +1036,6 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
   case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_PROPERTIES_FUCHSIA:                                   \
   case VK_STRUCTURE_TYPE_BUFFER_CONSTRAINTS_INFO_FUCHSIA:                                        \
   case VK_STRUCTURE_TYPE_BUILD_PARTITIONED_ACCELERATION_STRUCTURE_INFO_NV:                       \
-  case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV:                                                   \
-  case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV:                                                     \
   case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_CLUSTERS_BOTTOM_LEVEL_INPUT_NV:          \
   case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_COMMANDS_INFO_NV:                        \
   case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_INPUT_INFO_NV:                           \
@@ -1091,7 +1099,6 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
   case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE:                          \
   case VK_STRUCTURE_TYPE_DEVICE_ADDRESS_BINDING_CALLBACK_DATA_EXT:                               \
   case VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT:                            \
-  case VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV:                               \
   case VK_STRUCTURE_TYPE_DEVICE_FAULT_COUNTS_EXT:                                                \
   case VK_STRUCTURE_TYPE_DEVICE_FAULT_DEBUG_INFO_KHR:                                            \
   case VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_EXT:                                                  \
@@ -1280,7 +1287,6 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_EXT:               \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV:                \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT:                      \
-  case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV:                         \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRM_PROPERTIES_EXT:                                     \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ELAPSED_TIMER_QUERY_FEATURES_QCOM:                      \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV:                          \
@@ -1470,8 +1476,6 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
   case VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL:                         \
   case VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR:                       \
   case VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_PER_PARTITION_FEEDBACK_CREATE_INFO_KHR:         \
-  case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV:                                \
-  case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV:                                  \
   case VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_OPTICAL_FLOW_PROPERTIES_ARM:                    \
   case VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_PROPERTIES_ARM:               \
   case VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROPERTIES_ARM:                                 \