ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't build Vulkan video backend on macOS 

There's no official implementation of the Vulkan API,
and Dolphin currently isn't set-up to work with the
single, commercially-available third-party implementation.
This commit is contained in:
Michael Maltese 2016-10-06 16:47:03 -07:00
parent 3245ca236a
commit f301ebf780
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/CMakeLists.txt
View File

@ -236,7 +236,6 @@ set(LIBS
sfml-network sfml-network
sfml-system sfml-system
videonull videonull
videovulkan
videoogl videoogl
videosoftware videosoftware
z z
@ -249,6 +248,10 @@ if(LIBUSB_FOUND)
IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp) IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp)
endif(LIBUSB_FOUND) endif(LIBUSB_FOUND)
if(NOT APPLE)
set(LIBS ${LIBS} videovulkan)
endif()
set(LIBS ${LIBS} ${MBEDTLS_LIBRARIES}) set(LIBS ${LIBS} ${MBEDTLS_LIBRARIES})
if(WIN32) if(WIN32)

2
Source/Core/VideoBackends/CMakeLists.txt
View File

@ -1,5 +1,7 @@
add_subdirectory(OGL) add_subdirectory(OGL)
add_subdirectory(Null) add_subdirectory(Null)
add_subdirectory(Software) add_subdirectory(Software)
if(NOT APPLE)
add_subdirectory(Vulkan) add_subdirectory(Vulkan)
endif()
# TODO: Add other backends here! # TODO: Add other backends here!

4
Source/Core/VideoCommon/VideoBackendBase.cpp
View File

@ -15,7 +15,9 @@
#include "VideoBackends/Null/VideoBackend.h" #include "VideoBackends/Null/VideoBackend.h"
#include "VideoBackends/OGL/VideoBackend.h" #include "VideoBackends/OGL/VideoBackend.h"
#include "VideoBackends/Software/VideoBackend.h" #include "VideoBackends/Software/VideoBackend.h"
#ifndef __APPLE__
#include "VideoBackends/Vulkan/VideoBackend.h" #include "VideoBackends/Vulkan/VideoBackend.h"
#endif
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"
@ -49,7 +51,9 @@ void VideoBackendBase::PopulateList()
g_available_video_backends.push_back(std::make_unique<DX12::VideoBackend>()); g_available_video_backends.push_back(std::make_unique<DX12::VideoBackend>());
} }
#endif #endif
#ifndef __APPLE__
g_available_video_backends.push_back(std::make_unique<Vulkan::VideoBackend>()); g_available_video_backends.push_back(std::make_unique<Vulkan::VideoBackend>());
#endif
g_available_video_backends.push_back(std::make_unique<SW::VideoSoftware>()); g_available_video_backends.push_back(std::make_unique<SW::VideoSoftware>());
g_available_video_backends.push_back(std::make_unique<Null::VideoBackend>()); g_available_video_backends.push_back(std::make_unique<Null::VideoBackend>());