Support VK_EXT_primitive_topology_list_restart

This extension exposes a capability that pretty much all devices already
had.  It allows list topologies to be used with primitive restart.

renderdoc/driver/vulkan/vk_common.h

@@ -1012,6 +1012,7 @@ DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePointClippingProperties);
 DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePrivateDataFeatures);
 DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePresentIdFeaturesKHR);
 DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePresentWaitFeaturesKHR);
+DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT);
 DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceProperties2);
 DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceProtectedMemoryFeatures);
 DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceProtectedMemoryProperties);
@@ -1388,6 +1389,7 @@ DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePointClippingProperties);
 DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePrivateDataFeatures);
 DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePresentIdFeaturesKHR);
 DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePresentWaitFeaturesKHR);
+DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT);
 DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceProperties2);
 DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceProtectedMemoryFeatures);
 DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceProtectedMemoryProperties);

renderdoc/driver/vulkan/vk_core.cpp

@@ -1013,6 +1013,10 @@ static const VkExtensionProperties supportedExtensions[] = {
     {
         VK_EXT_POST_DEPTH_COVERAGE_EXTENSION_NAME, VK_EXT_POST_DEPTH_COVERAGE_SPEC_VERSION,
     },
+    {
+        VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_EXTENSION_NAME,
+        VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_SPEC_VERSION,
+    },
     {
         VK_EXT_PRIVATE_DATA_EXTENSION_NAME, VK_EXT_PRIVATE_DATA_SPEC_VERSION,
     },

renderdoc/driver/vulkan/vk_hookset_defs.h

@@ -527,6 +527,7 @@
   DeclExt(EXT_custom_border_color);             \
   DeclExt(EXT_robustness2);                     \
   DeclExt(EXT_pipeline_creation_cache_control); \
+  DeclExt(EXT_primitive_topology_list_restart); \
   DeclExt(EXT_private_data);                    \
   DeclExt(EXT_extended_dynamic_state);          \
   DeclExt(KHR_copy_commands2);                  \
@@ -636,6 +637,7 @@
   CheckExt(EXT_custom_border_color, VKXX);             \
   CheckExt(EXT_robustness2, VKXX);                     \
   CheckExt(EXT_pipeline_creation_cache_control, VKXX); \
+  CheckExt(EXT_primitive_topology_list_restart, VKXX); \
   CheckExt(EXT_private_data, VK13);                    \
   CheckExt(EXT_extended_dynamic_state, VK13);          \
   CheckExt(KHR_copy_commands2, VK13);                  \

renderdoc/driver/vulkan/vk_next_chains.cpp

@@ -342,6 +342,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
               VkPhysicalDevicePresentIdFeaturesKHR);                                                 \
   COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR,                           \
               VkPhysicalDevicePresentWaitFeaturesKHR);                                               \
+  COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT,        \
+              VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT)                               \
   COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2, VkPhysicalDeviceProperties2);          \
   COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES,                           \
               VkPhysicalDeviceProtectedMemoryFeatures);                                              \
@@ -841,7 +843,6 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct,
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROPERTIES_FEATURES_EXT:                   \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT:                   \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES_EXT:                 \
-  case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT:       \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT:            \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT:                      \
   case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT:                    \

renderdoc/driver/vulkan/vk_serialise.cpp

@@ -745,6 +745,10 @@ SERIALISE_VK_HANDLES();
   PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO,                               \
                VkPipelineCreationFeedbackCreateInfo)                                                   \
                                                                                                        \
+  /* VK_EXT_primitive_topology_list_restart */                                                         \
+  PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT,         \
+               VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT)                                \
+                                                                                                       \
   /* VK_EXT_private_data */                                                                            \
   PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES,                                \
                VkPhysicalDevicePrivateDataFeatures)                                                    \
@@ -1426,9 +1430,6 @@ SERIALISE_VK_HANDLES();
   PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT)                \
   PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES_EXT)              \
                                                                                                        \
-  /* VK_EXT_primitive_topology_list_restart */                                                         \
-  PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT)    \
-                                                                                                       \
   /* VK_EXT_primitives_generated_query */                                                              \
   PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT)         \
                                                                                                        \
@@ -6845,6 +6846,24 @@ void Deserialise(const VkPipelineShaderStageRequiredSubgroupSizeCreateInfo &el)
   DeserialiseNext(el.pNext);
 }
 
+template <typename SerialiserType>
+void DoSerialise(SerialiserType &ser, VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT &el)
+{
+  RDCASSERT(ser.IsReading() ||
+            el.sType ==
+                VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT);
+  SerialiseNext(ser, el.sType, el.pNext);
+
+  SERIALISE_MEMBER(primitiveTopologyListRestart);
+  SERIALISE_MEMBER(primitiveTopologyPatchListRestart);
+}
+
+template <>
+void Deserialise(const VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT &el)
+{
+  DeserialiseNext(el.pNext);
+}
+
 template <typename SerialiserType>
 void DoSerialise(SerialiserType &ser, VkPhysicalDevicePrivateDataFeatures &el)
 {
@@ -10636,6 +10655,7 @@ INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePointClippingProperties);
 INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePrivateDataFeatures);
 INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePresentIdFeaturesKHR);
 INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePresentWaitFeaturesKHR);
+INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT);
 INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceProperties2);
 INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceProtectedMemoryFeatures);
 INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceProtectedMemoryProperties);