From b97b37739728ded7240ee37f2a3061acf235a17c Mon Sep 17 00:00:00 2001 From: Noah Metz Date: Sun, 7 Jan 2024 03:13:49 -0700 Subject: [PATCH] Fixed macOS build --- src/main.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main.c b/src/main.c index 7f73c66..19ea8d7 100644 --- a/src/main.c +++ b/src/main.c @@ -44,21 +44,19 @@ VkInstance create_instance() { glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount); - uint32_t extensionCount = 0; - vkEnumerateInstanceExtensionProperties(0, &extensionCount, 0); - - VkExtensionProperties* extensions = (VkExtensionProperties*)(malloc(sizeof(VkExtensionProperties)*extensionCount)); - vkEnumerateInstanceExtensionProperties(0, &extensionCount, extensions); - - for(uint32_t i = 0; i < extensionCount; i++) { - fprintf(stderr, "Supported Extension: %s\n", extensions[i].extensionName); + const char** requested_extensions = malloc(sizeof(char*)*(glfwExtensionCount+1)); + for (uint32_t i = 0; i < glfwExtensionCount; i++) { + requested_extensions[i] = glfwExtensions[i]; } - free(extensions); + requested_extensions[glfwExtensionCount] = VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME; + + instance_info.enabledExtensionCount = glfwExtensionCount + 1; + instance_info.ppEnabledExtensionNames = requested_extensions; - instance_info.enabledExtensionCount = glfwExtensionCount; - instance_info.ppEnabledExtensionNames = glfwExtensions; instance_info.enabledLayerCount = 0; + instance_info.flags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR; + VkResult result = vkCreateInstance(&instance_info, 0, &instance); if(result != VK_SUCCESS) { @@ -66,6 +64,8 @@ VkInstance create_instance() { return 0; } + free(requested_extensions); + return instance; }