kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vulkan now initializing on macOS.

Browse Source 
Still requires copying libVulkan to the binary output directory.
This commit is contained in:
Kearwood Gilbert
2024-01-10 23:09:03 -08:00
parent b3263d874a
commit 8214cf475a
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kraken/KRDeviceManager.cpp
View File

@@ -89,41 +89,40 @@ KRDeviceManager::initialize()
app_info.applicationVersion = VK_MAKE_VERSION(0, 0, 1); app_info.applicationVersion = VK_MAKE_VERSION(0, 0, 1);
app_info.pEngineName = "Kraken Engine"; app_info.pEngineName = "Kraken Engine";
app_info.engineVersion = VK_MAKE_VERSION(0, 1, 0); app_info.engineVersion = VK_MAKE_VERSION(0, 1, 0);
app_info.apiVersion = VK_API_VERSION_1_0; app_info.apiVersion = VK_API_VERSION_1_3;
// VK_KHR_surface and VK_KHR_win32_surface // VK_KHR_surface and VK_KHR_win32_surface
const char* extensions[] = { const char* extensions[] = {
"VK_KHR_surface", VK_KHR_SURFACE_EXTENSION_NAME,
#if KRENGINE_DEBUG_GPU_LABELS #if KRENGINE_DEBUG_GPU_LABELS
"VK_EXT_debug_utils", VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
#endif #endif
#ifdef WIN32 #ifdef WIN32
"VK_KHR_win32_surface", VK_KHR_WIN32_SURFACE_EXTENSION_NAME,
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
"VK_EXT_metal_surface", VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME,
VK_EXT_METAL_SURFACE_EXTENSION_NAME,
#endif #endif
}; };
VkInstanceCreateFlags createFlags = 0;
#ifdef __APPLE__
createFlags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
#endif
// initialize the VkInstanceCreateInfo structure // initialize the VkInstanceCreateInfo structure
VkInstanceCreateInfo inst_info = {}; VkInstanceCreateInfo inst_info = {};
inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
inst_info.pNext = NULL; inst_info.pNext = NULL;
inst_info.flags = 0; inst_info.flags = createFlags;
inst_info.pApplicationInfo = &app_info; inst_info.pApplicationInfo = &app_info;
inst_info.enabledExtensionCount = 1; inst_info.enabledExtensionCount = std::size(extensions);
inst_info.ppEnabledExtensionNames = extensions; inst_info.ppEnabledExtensionNames = extensions;
inst_info.enabledLayerCount = 0; inst_info.enabledLayerCount = 0;
inst_info.ppEnabledLayerNames = NULL; inst_info.ppEnabledLayerNames = NULL;
#if KRENGINE_DEBUG_GPU_LABELS
inst_info.enabledExtensionCount++;
#endif
#ifdef WIN32
inst_info.enabledExtensionCount++;
#endif
res = vkCreateInstance(&inst_info, NULL, &m_vulkanInstance); res = vkCreateInstance(&inst_info, NULL, &m_vulkanInstance);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
destroyDevices(); destroyDevices();