HACK HACK Apple fixes for latest MoltenVk version

MoltenVk requires "VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME" to be enabled
Zorro666 · Feb 17, 2024 · a475241 · a475241
1 parent a263003
commit a475241
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
@@ -1530,6 +1530,9 @@ static const VkExtensionProperties supportedExtensions[] = {
         VK_KHR_PIPELINE_LIBRARY_EXTENSION_NAME,
         VK_KHR_PIPELINE_LIBRARY_SPEC_VERSION,
     },
+#ifdef VK_KHR_portability_enumeration
+    {VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME, VK_KHR_PORTABILITY_ENUMERATION_SPEC_VERSION},
+#endif
     {
         VK_KHR_PRESENT_ID_EXTENSION_NAME,
         VK_KHR_PRESENT_ID_SPEC_VERSION,

diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
@@ -408,6 +408,8 @@ RDResult WrappedVulkan::Initialise(VkInitParams &params, uint64_t sectionVersion
     instNext = &flagsEXT;
   }
 
+  params.Extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
+
   const char **layerscstr = new const char *[params.Layers.size()];
   for(size_t i = 0; i < params.Layers.size(); i++)
     layerscstr[i] = params.Layers[i].c_str();
@@ -419,7 +421,7 @@ RDResult WrappedVulkan::Initialise(VkInitParams &params, uint64_t sectionVersion
   VkInstanceCreateInfo instinfo = {
       VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
       instNext,
-      0,
+      VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR,
       &renderdocAppInfo,
       (uint32_t)params.Layers.size(),
       layerscstr,

diff --git a/util/test/demos/vk/vk_helpers.h b/util/test/demos/vk/vk_helpers.h
@@ -203,7 +203,7 @@ struct InstanceCreateInfo : public VkInstanceCreateInfo
   {
     sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
     pNext = NULL;
-    flags = 0;
+    flags = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
     pApplicationInfo = &appInfo;
     enabledLayerCount = uint32_t(layers.size());
     ppEnabledLayerNames = layers.data();

diff --git a/util/test/demos/vk/vk_test.cpp b/util/test/demos/vk/vk_test.cpp
@@ -171,7 +171,7 @@ void VulkanGraphicsTest::Prepare(int argc, char **argv)
       X11Window::Init();
 #elif defined(__APPLE__)
       enabledInstExts.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME);
-
+      enabledInstExts.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
       AppleWindow::Init();
 #else
 #error UNKNOWN PLATFORM