piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 23:59:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9190 from iwubcode/enable_vulkan_windows_solution

Browse Source 
VideoCommon: enable vulkan in windows solution, update CMake vulkan option to match opengl
This commit is contained in:
Léo Lam
2020-10-24 21:01:39 +02:00
committed by GitHub
parent 285b926e92 02c3242078
commit 1719e634b2
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -557,7 +557,12 @@ add_subdirectory(Externals/imgui)
add_subdirectory(Externals/glslang) add_subdirectory(Externals/glslang)
if(ENABLE_VULKAN) if(ENABLE_VULKAN)
add_definitions(-DUSE_VULKAN) add_definitions(-DHAS_VULKAN)
endif()
if(NOT WIN32 OR (NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")))
# OpenGL is available on all platforms except windows-arm64
add_definitions(-DHAS_OPENGL)
endif() endif()
find_package(pugixml) find_package(pugixml)

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

@ -22,11 +22,6 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
// OpenGL is not available on Windows-on-ARM64
#if !defined(_WIN32) || !defined(_M_ARM64)
#define HAS_OPENGL 1
#endif
// TODO: ugly // TODO: ugly
#ifdef _WIN32 #ifdef _WIN32
#include "VideoBackends/D3D/VideoBackend.h" #include "VideoBackends/D3D/VideoBackend.h"
@ -37,7 +32,9 @@
#include "VideoBackends/OGL/VideoBackend.h" #include "VideoBackends/OGL/VideoBackend.h"
#include "VideoBackends/Software/VideoBackend.h" #include "VideoBackends/Software/VideoBackend.h"
#endif #endif
#ifdef HAS_VULKAN
#include "VideoBackends/Vulkan/VideoBackend.h" #include "VideoBackends/Vulkan/VideoBackend.h"
#endif
#include "VideoCommon/AsyncRequests.h" #include "VideoCommon/AsyncRequests.h"
#include "VideoCommon/BPStructs.h" #include "VideoCommon/BPStructs.h"
@ -225,7 +222,7 @@ 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 USE_VULKAN #ifdef HAS_VULKAN
backends.push_back(std::make_unique<Vulkan::VideoBackend>()); backends.push_back(std::make_unique<Vulkan::VideoBackend>());
#endif #endif
#ifdef HAS_OPENGL #ifdef HAS_OPENGL

10
Source/Core/VideoCommon/VideoCommon.vcxproj
View File

@ -15,6 +15,16 @@
<Import Project="$(VSPropsDir)PCHUse.props" /> <Import Project="$(VSPropsDir)PCHUse.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
<ClCompile>
<PreprocessorDefinitions>HAS_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>HAS_VULKAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="AbstractFramebuffer.cpp" /> <ClCompile Include="AbstractFramebuffer.cpp" />
<ClCompile Include="AbstractStagingTexture.cpp" /> <ClCompile Include="AbstractStagingTexture.cpp" />