qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-20 17:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use deep binding for the vulkan loader

Browse source 
This fixes the problem with using vkGetInstanceProcAddr to find global
vulkan functions.
This commit is contained in:
Bill Currie 2019-07-07 16:48:53 +09:00
parent 7137d61c36
commit 6137795682
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/video/renderer/vulkan/vulkan_vid_common.c
View file

@ -64,7 +64,8 @@ static VulkanDevice_t *vulkan_device;
static void
load_vulkan_library (void)
{
vulkan_library = dlopen (vulkan_library_name->string, RTLD_NOW);
vulkan_library = dlopen (vulkan_library_name->string,
RTLD_DEEPBIND | RTLD_NOW);
if (!vulkan_library) {
Sys_Error ("Couldn't load vulkan library %s: %s",
vulkan_library_name->name, dlerror ());
@ -76,13 +77,8 @@ load_vulkan_library (void)
Sys_Error ("Couldn't find exported vulkan function %s", #name); \
}
// Can't use vkGetInstanceProcAddr (0, ...) here because it grabs from
// the whole exe and thus sees the function pointers instead of the actual
// functions. Sure, could rename all the function pointers, but while that
// worked for gl and glsl, it also made it a real pain to work with the
// spec (or man pages, etc). Of course, namespaces would help, too.
#define GLOBAL_LEVEL_VULKAN_FUNCTION(name) \
name = (PFN_##name) dlsym (vulkan_library, #name); \
name = (PFN_##name) vkGetInstanceProcAddr (0, #name); \
if (!name) { \
Sys_Error ("Couldn't find global-level function %s", #name); \
}