GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-27 00:15:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add Sirit as a submodule

Browse Source 
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.
This commit is contained in:
PixelyIon 2021-11-21 13:05:18 +05:30
parent dbc94f36d3
commit 746af4cb4c
5 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -45,3 +45,6 @@
[submodule "C++ Range v3"] [submodule "C++ Range v3"]
path = app/libraries/range path = app/libraries/range
url = https://github.com/ericniebler/range-v3 url = https://github.com/ericniebler/range-v3
[submodule "Sirit"]
path = app/libraries/sirit
url = https://github.com/ReinUsesLisp/sirit

3
app/CMakeLists.txt
View File

@ -101,6 +101,9 @@ add_subdirectory("libraries/boost")
# C++ Range v3 # C++ Range v3
add_subdirectory("libraries/range") add_subdirectory("libraries/range")
# Sirit
add_subdirectory("libraries/sirit")
# Build Skyline with full debugging data and -Og for debug builds # Build Skyline with full debugging data and -Og for debug builds
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -glldb -gdwarf-5") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -glldb -gdwarf-5")

1
app/libraries/sirit Submodule

@ -0,0 +1 @@
Subproject commit 8cfe8badf70a7da0fa41e7f236bd6c5e52fa41ff

1
app/src/main/res/values/strings.xml
View File

@ -132,6 +132,7 @@
<string name="licenses">Licenses</string> <string name="licenses">Licenses</string>
<string name="skyline_license_description">Skyline is licensed under Mozilla Public License 2.0</string> <string name="skyline_license_description">Skyline is licensed under Mozilla Public License 2.0</string>
<string name="ryujinx_description">Ryujinx has been used for reference throughout the project due to their highly accurate implementations\n\n<b>Note: Skyline is not based on Ryujinx</b></string> <string name="ryujinx_description">Ryujinx has been used for reference throughout the project due to their highly accurate implementations\n\n<b>Note: Skyline is not based on Ryujinx</b></string>
<string name="sirit_description">Skyline\'s shader compiler internally uses Sirit to emit SPIR-V in an efficient manner</string>
<string name="vkhpp_description">Vulkan-Hpp provides a C++ API for Vulkan</string> <string name="vkhpp_description">Vulkan-Hpp provides a C++ API for Vulkan</string>
<string name="vkma_description">Vulkan Memory Allocator provides a high-quality GPU memory allocator with UMA support</string> <string name="vkma_description">Vulkan Memory Allocator provides a high-quality GPU memory allocator with UMA support</string>
<string name="khvkval_description">Khronos\'s Vulkan Validation Layer provides error-checking for Vulkan API calls in debug builds</string> <string name="khvkval_description">Khronos\'s Vulkan Validation Layer provides error-checking for Vulkan API calls in debug builds</string>

6
app/src/main/res/xml/preferences.xml
View File

@ -139,6 +139,12 @@
app:libraryUrl="https://github.com/Ryujinx/Ryujinx" app:libraryUrl="https://github.com/Ryujinx/Ryujinx"
app:summary="@string/ryujinx_description" app:summary="@string/ryujinx_description"
app:title="Ryujinx" /> app:title="Ryujinx" />
<emu.skyline.preference.LicensePreference
app:libraryCopyright="Copyright (c) 2019, sirit\nAll rights reserved."
app:libraryLicense="@string/bsd_3_clause_license"
app:libraryUrl="https://github.com/ReinUsesLisp/sirit"
app:summary="@string/sirit_description"
app:title="Sirit" />
<emu.skyline.preference.LicensePreference <emu.skyline.preference.LicensePreference
app:libraryCopyright="Copyright 2015-2020 The Khronos Group Inc." app:libraryCopyright="Copyright 2015-2020 The Khronos Group Inc."
app:libraryLicense="@string/apache2_license" app:libraryLicense="@string/apache2_license"