diff options
| author | 2019-03-14 02:17:19 -0300 | |
|---|---|---|
| committer | 2019-04-10 14:20:25 -0300 | |
| commit | 970d9e57c817028ad4c2695adc8205e303de20b9 (patch) | |
| tree | 23e1ff2b90d5dad68f75366b71fdd74e5ab1218d | |
| parent | Merge pull request #2345 from ReinUsesLisp/multibind (diff) | |
| download | yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.tar.gz yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.tar.xz yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.zip | |
video_core: Add sirit as optional dependency with Vulkan
sirit is a runtime assembler for SPIR-V
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| m--------- | externals/sirit | 0 | ||||
| -rw-r--r-- | src/video_core/CMakeLists.txt | 5 |
4 files changed, 12 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 26b4e5272..3a49c4874 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -43,3 +43,6 @@ | |||
| 43 | [submodule "externals/zstd"] | 43 | [submodule "externals/zstd"] |
| 44 | path = externals/zstd | 44 | path = externals/zstd |
| 45 | url = https://github.com/facebook/zstd | 45 | url = https://github.com/facebook/zstd |
| 46 | [submodule "sirit"] | ||
| 47 | path = externals/sirit | ||
| 48 | url = https://github.com/ReinUsesLisp/sirit | ||
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index aa3319eb1..3f8b6cda8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -72,6 +72,11 @@ if (USE_DISCORD_PRESENCE) | |||
| 72 | target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) | 72 | target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) |
| 73 | endif() | 73 | endif() |
| 74 | 74 | ||
| 75 | # Sirit | ||
| 76 | if (ENABLE_VULKAN) | ||
| 77 | add_subdirectory(sirit) | ||
| 78 | endif() | ||
| 79 | |||
| 75 | if (ENABLE_WEB_SERVICE) | 80 | if (ENABLE_WEB_SERVICE) |
| 76 | # LibreSSL | 81 | # LibreSSL |
| 77 | set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") | 82 | set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") |
diff --git a/externals/sirit b/externals/sirit new file mode 160000 | |||
| Subproject f7c4b07a7e14edb1dcd93bc9879c823423705c2 | |||
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 242a0d1cd..fe6b6ef7d 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -132,7 +132,7 @@ if (ENABLE_VULKAN) | |||
| 132 | renderer_vulkan/vk_swapchain.cpp | 132 | renderer_vulkan/vk_swapchain.cpp |
| 133 | renderer_vulkan/vk_swapchain.h) | 133 | renderer_vulkan/vk_swapchain.h) |
| 134 | 134 | ||
| 135 | target_include_directories(video_core PRIVATE ../../externals/Vulkan-Headers/include) | 135 | target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include) |
| 136 | target_compile_definitions(video_core PRIVATE HAS_VULKAN) | 136 | target_compile_definitions(video_core PRIVATE HAS_VULKAN) |
| 137 | endif() | 137 | endif() |
| 138 | 138 | ||
| @@ -140,3 +140,6 @@ create_target_directory_groups(video_core) | |||
| 140 | 140 | ||
| 141 | target_link_libraries(video_core PUBLIC common core) | 141 | target_link_libraries(video_core PUBLIC common core) |
| 142 | target_link_libraries(video_core PRIVATE glad) | 142 | target_link_libraries(video_core PRIVATE glad) |
| 143 | if (ENABLE_VULKAN) | ||
| 144 | target_link_libraries(video_core PRIVATE sirit) | ||
| 145 | endif() | ||