mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Fixed VK (MoltenVK 1.2.6).

Browse Source
This commit is contained in:
Бранимир Караџић 2023-12-01 20:51:28 -08:00
parent 5de37d0e22
commit edb72488bc
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/runtime/.gitignore vendored
View File

@ -1,4 +1,5 @@
*.dll *.dll
*.dylib
*.so *.so
*.pdb *.pdb
imgui* imgui*

2
src/bgfx.cpp
View File

@ -2727,7 +2727,7 @@ namespace bgfx
else if (BX_ENABLED(BX_PLATFORM_OSX) ) else if (BX_ENABLED(BX_PLATFORM_OSX) )
{ {
score += RendererType::Metal == renderer ? 20 : 0; score += RendererType::Metal == renderer ? 20 : 0;
score += RendererType::OpenGL == renderer ? 10 : 0; score += RendererType::Vulkan == renderer ? 10 : 0;
} }
else if (BX_ENABLED(BX_PLATFORM_IOS) ) else if (BX_ENABLED(BX_PLATFORM_IOS) )
{ {

19
src/renderer_vk.cpp
View File

@ -1161,7 +1161,7 @@ VK_IMPORT_DEVICE
#elif BX_PLATFORM_ANDROID #elif BX_PLATFORM_ANDROID
"libvulkan.so" "libvulkan.so"
#elif BX_PLATFORM_OSX #elif BX_PLATFORM_OSX
"libvulkan.dylib" "libMoltenVK.dylib"
#else #else
"libvulkan.so.1" "libvulkan.so.1"
#endif // BX_PLATFORM_* #endif // BX_PLATFORM_*
@ -1230,21 +1230,12 @@ VK_IMPORT
BX_TRACE("\t%s", layer.m_name); BX_TRACE("\t%s", layer.m_name);
} }
} }
#if BX_PLATFORM_OSX || defined(WL_EGL_PLATFORM)
uint32_t numEnabledExtensions = headless ? 0 : 3;
const char* enabledExtension[Extension::Count + 3] =
#else
uint32_t numEnabledExtensions = headless ? 0 : 2; uint32_t numEnabledExtensions = headless ? 0 : 2;
const char* enabledExtension[Extension::Count + 2] = const char* enabledExtension[Extension::Count + 2] =
#endif
{ {
VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_EXTENSION_NAME,
KHR_SURFACE_EXTENSION_NAME, KHR_SURFACE_EXTENSION_NAME,
#if BX_PLATFORM_OSX
VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME,
#endif
}; };
for (uint32_t ii = 0; ii < Extension::Count; ++ii) for (uint32_t ii = 0; ii < Extension::Count; ++ii)
@ -1306,11 +1297,9 @@ VK_IMPORT
VkInstanceCreateInfo ici; VkInstanceCreateInfo ici;
ici.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; ici.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
ici.pNext = NULL; ici.pNext = NULL;
#if BX_PLATFORM_OSX ici.flags = 0
ici.flags = 0 | VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR; | (BX_ENABLED(BX_PLATFORM_OSX) ? VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR : 0)
#else ;
ici.flags = 0;
#endif
ici.pApplicationInfo = &appInfo; ici.pApplicationInfo = &appInfo;
ici.enabledLayerCount = numEnabledLayers; ici.enabledLayerCount = numEnabledLayers;
ici.ppEnabledLayerNames = enabledLayer; ici.ppEnabledLayerNames = enabledLayer;