Browse Source

vulkan: Don't rely on headers providing VK_KHR_robustness2

This is a very new extension, so that would require a very recent SDK
rdb 1 month ago
parent
commit
25162904b2

+ 3 - 3
panda/src/vulkandisplay/vulkanGraphicsPipe.cxx

@@ -327,11 +327,11 @@ VulkanGraphicsPipe() : _max_allocation_size(0) {
       features2.pNext = &cbc_features;
     }
 
-    VkPhysicalDeviceRobustness2FeaturesKHR ro2_features = {
-      VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR,
+    VkPhysicalDeviceRobustness2FeaturesEXT ro2_features = {
+      VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT,
       features2.pNext,
     };
-    if (has_device_extension(VK_KHR_ROBUSTNESS_2_EXTENSION_NAME) ||
+    if (has_device_extension("VK_KHR_robustness2") ||
         has_device_extension(VK_EXT_ROBUSTNESS_2_EXTENSION_NAME)) {
       features2.pNext = &ro2_features;
     }

+ 4 - 4
panda/src/vulkandisplay/vulkanGraphicsStateGuardian.cxx

@@ -183,16 +183,16 @@ reset() {
   }
 
   bool supports_null_descriptor = false;
-  VkPhysicalDeviceRobustness2FeaturesKHR ro2_features = {
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR,
+  VkPhysicalDeviceRobustness2FeaturesEXT ro2_features = {
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT,
     enabled_features.pNext,
   };
   if (pipe->_gpu_supports_null_descriptor) {
     ro2_features.nullDescriptor = VK_TRUE;
     enabled_features.pNext = &ro2_features;
 
-    if (pipe->has_device_extension(VK_KHR_ROBUSTNESS_2_EXTENSION_NAME)) {
-      extensions.push_back(VK_KHR_ROBUSTNESS_2_EXTENSION_NAME);
+    if (pipe->has_device_extension("VK_KHR_robustness2")) {
+      extensions.push_back("VK_KHR_robustness2");
     } else {
       extensions.push_back(VK_EXT_ROBUSTNESS_2_EXTENSION_NAME);
     }