Merge pull request #11073 from Hibyehello/Fix-Metal-init

Add Metal as backend option with Vulkan Disabled
This commit is contained in:
Admiral H. Curtiss
2022-09-23 04:21:23 +02:00
committed by GitHub

View File

@ -226,11 +226,13 @@ const std::vector<std::unique_ptr<VideoBackendBase>>& VideoBackendBase::GetAvail
backends.push_back(std::make_unique<DX11::VideoBackend>()); backends.push_back(std::make_unique<DX11::VideoBackend>());
backends.push_back(std::make_unique<DX12::VideoBackend>()); backends.push_back(std::make_unique<DX12::VideoBackend>());
#endif #endif
#ifdef __APPLE__
backends.push_back(std::make_unique<Metal::VideoBackend>());
#endif
#ifdef HAS_VULKAN #ifdef HAS_VULKAN
#ifdef __APPLE__ #ifdef __APPLE__
// Emplace the Vulkan backend at the beginning so it takes precedence over OpenGL. // Emplace the Vulkan backend at the beginning so it takes precedence over OpenGL.
backends.emplace(backends.begin(), std::make_unique<Vulkan::VideoBackend>()); backends.emplace(backends.begin(), std::make_unique<Vulkan::VideoBackend>());
backends.push_back(std::make_unique<Metal::VideoBackend>());
#else #else
backends.push_back(std::make_unique<Vulkan::VideoBackend>()); backends.push_back(std::make_unique<Vulkan::VideoBackend>());
#endif #endif