From 746af4cb4c66b13b11305855f78b8799d8a2683a Mon Sep 17 00:00:00 2001 From: PixelyIon Date: Sun, 21 Nov 2021 13:05:18 +0530 Subject: [PATCH] Add Sirit as a submodule We require Sirit as it is a dependency for yuzu's shader compiler where it uses it to emit SPIR-V in an easy and efficient manner. --- .gitmodules | 3 +++ app/CMakeLists.txt | 3 +++ app/libraries/sirit | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/preferences.xml | 6 ++++++ 5 files changed, 14 insertions(+) create mode 160000 app/libraries/sirit diff --git a/.gitmodules b/.gitmodules index 900c2625..c919b4ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -45,3 +45,6 @@ [submodule "C++ Range v3"] path = app/libraries/range url = https://github.com/ericniebler/range-v3 +[submodule "Sirit"] + path = app/libraries/sirit + url = https://github.com/ReinUsesLisp/sirit diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index ee5fe4a3..767aca97 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -101,6 +101,9 @@ add_subdirectory("libraries/boost") # C++ Range v3 add_subdirectory("libraries/range") +# Sirit +add_subdirectory("libraries/sirit") + # Build Skyline with full debugging data and -Og for debug builds set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -glldb -gdwarf-5") diff --git a/app/libraries/sirit b/app/libraries/sirit new file mode 160000 index 00000000..8cfe8bad --- /dev/null +++ b/app/libraries/sirit @@ -0,0 +1 @@ +Subproject commit 8cfe8badf70a7da0fa41e7f236bd6c5e52fa41ff diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 762d9556..8d844eb6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -132,6 +132,7 @@ Licenses Skyline is licensed under Mozilla Public License 2.0 Ryujinx has been used for reference throughout the project due to their highly accurate implementations\n\nNote: Skyline is not based on Ryujinx + Skyline\'s shader compiler internally uses Sirit to emit SPIR-V in an efficient manner Vulkan-Hpp provides a C++ API for Vulkan Vulkan Memory Allocator provides a high-quality GPU memory allocator with UMA support Khronos\'s Vulkan Validation Layer provides error-checking for Vulkan API calls in debug builds diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 08dcce9f..dc8deb1c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -139,6 +139,12 @@ app:libraryUrl="https://github.com/Ryujinx/Ryujinx" app:summary="@string/ryujinx_description" app:title="Ryujinx" /> +