Forráskód Böngészése

video_core: Add sirit as optional dependency with Vulkan

sirit is a runtime assembler for SPIR-V
ReinUsesLisp 7 éve
szülő
commit
970d9e57c8
4 módosított fájl, 13 hozzáadás és 1 törlés
  1. 3 0
      .gitmodules
  2. 5 0
      externals/CMakeLists.txt
  3. 1 0
      externals/sirit
  4. 4 1
      src/video_core/CMakeLists.txt

+ 3 - 0
.gitmodules

@@ -43,3 +43,6 @@
 [submodule "externals/zstd"]
     path = externals/zstd
     url = https://github.com/facebook/zstd
+[submodule "sirit"]
+    path = externals/sirit
+    url = https://github.com/ReinUsesLisp/sirit

+ 5 - 0
externals/CMakeLists.txt

@@ -72,6 +72,11 @@ if (USE_DISCORD_PRESENCE)
     target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)
 endif()
 
+# Sirit
+if (ENABLE_VULKAN)
+    add_subdirectory(sirit)
+endif()
+
 if (ENABLE_WEB_SERVICE)
     # LibreSSL
     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")

+ 1 - 0
externals/sirit

@@ -0,0 +1 @@
+Subproject commit f7c4b07a7e14edb1dcd93bc9879c823423705c2e

+ 4 - 1
src/video_core/CMakeLists.txt

@@ -132,7 +132,7 @@ if (ENABLE_VULKAN)
         renderer_vulkan/vk_swapchain.cpp
         renderer_vulkan/vk_swapchain.h)
 
-    target_include_directories(video_core PRIVATE ../../externals/Vulkan-Headers/include)
+    target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include)
     target_compile_definitions(video_core PRIVATE HAS_VULKAN)
 endif()
 
@@ -140,3 +140,6 @@ create_target_directory_groups(video_core)
 
 target_link_libraries(video_core PUBLIC common core)
 target_link_libraries(video_core PRIVATE glad)
+if (ENABLE_VULKAN)
+    target_link_libraries(video_core PRIVATE sirit)
+endif()