ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GPUDevice: Fix SPIRV-Cross load error on Mac

This commit is contained in:
Stenzek 2024-08-05 01:12:17 +10:00
parent d862043f1d
commit 79bb5f079c
No known key found for this signature in database
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/appimage/make-appimage.sh
View File

@ -58,7 +58,7 @@ STRIP=strip
declare -a MANUAL_LIBS=( declare -a MANUAL_LIBS=(
"libdiscord-rpc.so" "libdiscord-rpc.so"
"libshaderc_shared.so" "libshaderc_shared.so"
"libspirv-cross-c-shared.so.0.61.0" "libspirv-cross-c-shared.so.0"
) )
declare -a MANUAL_QT_LIBS=( declare -a MANUAL_QT_LIBS=(

3
src/util/gpu_device.cpp
View File

@ -1321,8 +1321,7 @@ bool dyn_libs::OpenSpirvCross(Error* error)
// SPVC's build on Windows doesn't spit out a versioned DLL. // SPVC's build on Windows doesn't spit out a versioned DLL.
const std::string libname = DynamicLibrary::GetVersionedFilename("spirv-cross-c-shared"); const std::string libname = DynamicLibrary::GetVersionedFilename("spirv-cross-c-shared");
#else #else
const std::string libname = DynamicLibrary::GetVersionedFilename("spirv-cross-c-shared", SPVC_C_API_VERSION_MAJOR, const std::string libname = DynamicLibrary::GetVersionedFilename("spirv-cross-c-shared", SPVC_C_API_VERSION_MAJOR);
SPVC_C_API_VERSION_MINOR, SPVC_C_API_VERSION_PATCH);
#endif #endif
if (!s_spirv_cross_library.Open(libname.c_str(), error)) if (!s_spirv_cross_library.Open(libname.c_str(), error))
{ {