sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GPUDevice: Use suffixed shaderc libname

Browse Source 
Avoids conflicts with other installations of shaderc, e.g. the Vulkan
SDK, which might be in the user's LD_LIBRARY_PATH.
This commit is contained in:
Stenzek
2024-09-13 23:05:01 +10:00
parent d28f0fa4e6
commit 350cf7ee32
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/gpu_device.cpp
View File

@ -1210,6 +1210,13 @@ std::unique_ptr<GPUDevice> GPUDevice::CreateDeviceForAPI(RenderAPI api)
}
}
#ifndef _WIN32
// Use a duckstation-suffixed shaderc name to avoid conflicts and loading another shaderc, e.g. from the Vulkan SDK.
#define SHADERC_LIB_NAME "shaderc_ds"
#else
#define SHADERC_LIB_NAME "shaderc_shared"
#endif
#define SHADERC_FUNCTIONS(X) \
X(shaderc_compiler_initialize) \
X(shaderc_compiler_release) \
@ -1285,7 +1292,7 @@ bool dyn_libs::OpenShaderc(Error* error)
if (s_shaderc_library.IsOpen())
return true;
const std::string libname = DynamicLibrary::GetVersionedFilename("shaderc_shared");
const std::string libname = DynamicLibrary::GetVersionedFilename(SHADERC_LIB_NAME);
if (!s_shaderc_library.Open(libname.c_str(), error))
{
Error::AddPrefix(error, "Failed to load shaderc: ");