wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Load libvulkan dynamically.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-01-17 12:48:14 +01:00 committed by Alexandre Julliard
parent fcc6846559
commit 10b04414e8
4 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -89,7 +89,7 @@ libvkd3d_la_SOURCES = \
libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_main.c \
libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vkd3d_private.h \
libs/vkd3d/vulkan_procs.h libs/vkd3d/vulkan_procs.h
libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @PTHREAD_LIBS@ @VULKAN_LIBS@ libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
libvkd3d_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map libvkd3d_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map
endif endif

5
configure.ac
View File

@ -62,6 +62,11 @@ m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config aut
AC_CHECK_LIB([m], [ceilf]) AC_CHECK_LIB([m], [ceilf])
AC_ARG_VAR([DL_LIBS], [linker flags for dl])
AC_CHECK_LIB([dl], [dlopen],
[AC_SUBST([DL_LIBS], ["-ldl"])],
[AC_MSG_ERROR([libdl not found.])])
AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
AC_CHECK_LIB([pthread], [pthread_create], AC_CHECK_LIB([pthread], [pthread_create],
[AC_SUBST([PTHREAD_LIBS], ["-lpthread"])], [AC_SUBST([PTHREAD_LIBS], ["-lpthread"])],

34
libs/vkd3d/device.c
View File

@ -18,6 +18,8 @@
#include "vkd3d_private.h" #include "vkd3d_private.h"
#include <dlfcn.h>
struct vkd3d_optional_extension_info struct vkd3d_optional_extension_info
{ {
const char *extension_name; const char *extension_name;
@ -176,16 +178,34 @@ static bool vkd3d_init_vk_global_procs(struct vkd3d_instance *instance,
{ {
struct vkd3d_vulkan_procs_info *procs = &instance->vk_global_procs; struct vkd3d_vulkan_procs_info *procs = &instance->vk_global_procs;
instance->libvulkan = NULL;
if (vulkan_procs_info) if (vulkan_procs_info)
{ {
*procs = *vulkan_procs_info; *procs = *vulkan_procs_info;
return true; return true;
} }
procs->vkCreateInstance = vkCreateInstance; if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW)))
procs->vkDestroyInstance = vkDestroyInstance; {
procs->vkGetInstanceProcAddr = vkGetInstanceProcAddr; ERR("Failed to load libvulkan.\n");
procs->vkEnumerateInstanceExtensionProperties = vkEnumerateInstanceExtensionProperties; return false;
}
#define LOAD_PROC(name) \
if (!(procs->name = dlsym(instance->libvulkan, #name))) \
{ \
ERR("Could not get proc addr for '" #name "'.\n"); \
dlclose(instance->libvulkan); \
instance->libvulkan = NULL; \
return false; \
}
LOAD_PROC(vkCreateInstance)
LOAD_PROC(vkDestroyInstance)
LOAD_PROC(vkGetInstanceProcAddr)
LOAD_PROC(vkEnumerateInstanceExtensionProperties)
#undef LOAD_PROC
return true; return true;
} }
@ -248,6 +268,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
if ((vr = vk_global_procs->vkCreateInstance(&instance_info, NULL, &vk_instance))) if ((vr = vk_global_procs->vkCreateInstance(&instance_info, NULL, &vk_instance)))
{ {
ERR("Failed to create Vulkan instance, vr %d.\n", vr); ERR("Failed to create Vulkan instance, vr %d.\n", vr);
if (instance->libvulkan)
dlclose(instance->libvulkan);
return hresult_from_vk_result(vr); return hresult_from_vk_result(vr);
} }
@ -255,6 +277,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
{ {
ERR("Failed to load instance procs, hr %#x.\n", hr); ERR("Failed to load instance procs, hr %#x.\n", hr);
vk_global_procs->vkDestroyInstance(vk_instance, NULL); vk_global_procs->vkDestroyInstance(vk_instance, NULL);
if (instance->libvulkan)
dlclose(instance->libvulkan);
return hr; return hr;
} }
@ -310,6 +334,8 @@ ULONG vkd3d_instance_decref(struct vkd3d_instance *instance)
{ {
const struct vkd3d_vk_instance_procs *vk_procs = &instance->vk_procs; const struct vkd3d_vk_instance_procs *vk_procs = &instance->vk_procs;
VK_CALL(vkDestroyInstance(instance->vk_instance, NULL)); VK_CALL(vkDestroyInstance(instance->vk_instance, NULL));
if (instance->libvulkan)
dlclose(instance->libvulkan);
vkd3d_free(instance); vkd3d_free(instance);
} }

10
libs/vkd3d/vkd3d_private.h
View File

@ -88,6 +88,7 @@ struct vkd3d_instance
struct vkd3d_vulkan_info vk_info; struct vkd3d_vulkan_info vk_info;
struct vkd3d_vulkan_procs_info vk_global_procs; struct vkd3d_vulkan_procs_info vk_global_procs;
void *libvulkan;
LONG refcount; LONG refcount;
}; };
@ -752,13 +753,4 @@ HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs,
HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs,
const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN; const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN;
/* We link directly to the loader library and use the following exported functions. */
VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance,
const char *name);
VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(const VkInstanceCreateInfo *create_info,
const VkAllocationCallbacks *allocator, VkInstance *instance);
VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties(const char *layer_name,
uint32_t *property_count, VkExtensionProperties *properties);
VKAPI_ATTR void VKAPI_CALL vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *allocator);
#endif /* __VKD3D_PRIVATE_H */ #endif /* __VKD3D_PRIVATE_H */