January 2018 - Wine-commits

Józef Kucia : libs/vkd3d: Allow library user to load libvulkan.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: fcc6846559df842e5bfd016a7b832818b7c99983 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fcc6846559df842e5bfd016… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:13 2018 +0100 libs/vkd3d: Allow library user to load libvulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 9 ++++++++ libs/vkd3d-utils/vkd3d_utils_main.c | 1 + libs/vkd3d/device.c | 46 +++++++++++++++++++++++++++++-------- libs/vkd3d/utils.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 4 ++-- libs/vkd3d/vulkan_procs.h | 2 +- 6 files changed, 52 insertions(+), 14 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 6017e1a..5ae7603 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -43,12 +43,21 @@ typedef bool (*vkd3d_join_thread_pfn)(void *thread); struct vkd3d_instance; +struct vkd3d_vulkan_procs_info +{ + PFN_vkCreateInstance vkCreateInstance; + PFN_vkDestroyInstance vkDestroyInstance; + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; + PFN_vkEnumerateInstanceExtensionProperties vkEnumerateInstanceExtensionProperties; +}; + struct vkd3d_instance_create_info { vkd3d_signal_event_pfn signal_event_pfn; vkd3d_create_thread_pfn create_thread_pfn; vkd3d_join_thread_pfn join_thread_pfn; size_t wchar_size; + const struct vkd3d_vulkan_procs_info *vulkan_procs_info; }; struct vkd3d_device_create_info diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 9fe61a1..2ea0a16 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -41,6 +41,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, instance_create_info.create_thread_pfn = NULL; instance_create_info.join_thread_pfn = NULL; instance_create_info.wchar_size = sizeof(WCHAR); + instance_create_info.vulkan_procs_info = NULL; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = NULL; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3255dd6..62271db 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -136,13 +136,15 @@ static unsigned int vkd3d_enable_extensions(const char *extensions[], return i; } -static void vkd3d_init_instance_caps(struct vkd3d_vulkan_info *vulkan_info) +static void vkd3d_init_instance_caps(struct vkd3d_instance *instance) { + const struct vkd3d_vulkan_procs_info *vk_procs = &instance->vk_global_procs; + struct vkd3d_vulkan_info *vulkan_info = &instance->vk_info; VkExtensionProperties *vk_extensions; uint32_t count; VkResult vr; - if ((vr = vkEnumerateInstanceExtensionProperties(NULL, &count, NULL)) < 0) + if ((vr = vk_procs->vkEnumerateInstanceExtensionProperties(NULL, &count, NULL)) < 0) { ERR("Failed to enumerate instance extensions, vr %d.\n", vr); return; @@ -154,7 +156,7 @@ static void vkd3d_init_instance_caps(struct vkd3d_vulkan_info *vulkan_info) return; TRACE("Enumerating %u instance extensions.\n", count); - if ((vr = vkEnumerateInstanceExtensionProperties(NULL, &count, vk_extensions)) < 0) + if ((vr = vk_procs->vkEnumerateInstanceExtensionProperties(NULL, &count, vk_extensions)) < 0) { ERR("Failed to enumerate instance extensions, vr %d.\n", vr); vkd3d_free(vk_extensions); @@ -169,9 +171,28 @@ static void vkd3d_init_instance_caps(struct vkd3d_vulkan_info *vulkan_info) vkd3d_free(vk_extensions); } +static bool vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, + const struct vkd3d_vulkan_procs_info *vulkan_procs_info) +{ + struct vkd3d_vulkan_procs_info *procs = &instance->vk_global_procs; + + if (vulkan_procs_info) + { + *procs = *vulkan_procs_info; + return true; + } + + procs->vkCreateInstance = vkCreateInstance; + procs->vkDestroyInstance = vkDestroyInstance; + procs->vkGetInstanceProcAddr = vkGetInstanceProcAddr; + procs->vkEnumerateInstanceExtensionProperties = vkEnumerateInstanceExtensionProperties; + return true; +} + static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { + const struct vkd3d_vulkan_procs_info *vk_global_procs = &instance->vk_global_procs; const char *extensions[MAX_INSTANCE_EXTENSION_COUNT]; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; @@ -195,8 +216,14 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance->join_thread = create_info->join_thread_pfn; instance->wchar_size = create_info->wchar_size; + if (!vkd3d_init_vk_global_procs(instance, create_info->vulkan_procs_info)) + { + ERR("Failed to initialize Vulkan global procs.\n"); + return E_FAIL; + } + memset(&instance->vk_info, 0, sizeof(instance->vk_info)); - vkd3d_init_instance_caps(&instance->vk_info); + vkd3d_init_instance_caps(instance); application_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; application_info.pNext = NULL; @@ -218,16 +245,16 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, &instance->vk_info); instance_info.ppEnabledExtensionNames = extensions; - if ((vr = 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); return hresult_from_vk_result(vr); } - if (FAILED(hr = vkd3d_load_vk_instance_procs(&instance->vk_procs, vk_instance))) + if (FAILED(hr = vkd3d_load_vk_instance_procs(&instance->vk_procs, vk_global_procs, vk_instance))) { ERR("Failed to load instance procs, hr %#x.\n", hr); - vkDestroyInstance(vk_instance, NULL); + vk_global_procs->vkDestroyInstance(vk_instance, NULL); return hr; } @@ -872,7 +899,8 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDev if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device))) { ERR("Failed to load device procs, hr %#x.\n", hr); - vkDestroyDevice(vk_device, NULL); + if (device->vk_procs.vkDestroyDevice) + device->vk_procs.vkDestroyDevice(vk_device, NULL); return hr; } @@ -884,7 +912,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDev copy_queue_family_index, copy_queue_timestamp_bits))) { ERR("Failed to create queues, hr %#x.\n", hr); - vkDestroyDevice(vk_device, NULL); + device->vk_procs.vkDestroyDevice(vk_device, NULL); return hr; } diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index f94dce5..84141aa 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -351,14 +351,14 @@ HRESULT hresult_from_vk_result(VkResult vr) } #define LOAD_INSTANCE_PFN(name) \ - if (!(procs->name = (void *)vkGetInstanceProcAddr(instance, #name))) \ + if (!(procs->name = (void *)global_procs->vkGetInstanceProcAddr(instance, #name))) \ { \ ERR("Could not get instance proc addr for '" #name "'.\n"); \ return E_FAIL; \ } HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, - VkInstance instance) + const struct vkd3d_vulkan_procs_info *global_procs, VkInstance instance) { memset(procs, 0, sizeof(*procs)); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index eca6895..f32b64a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -87,6 +87,7 @@ struct vkd3d_instance size_t wchar_size; struct vkd3d_vulkan_info vk_info; + struct vkd3d_vulkan_procs_info vk_global_procs; LONG refcount; }; @@ -747,7 +748,7 @@ const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, - VkInstance instance) DECLSPEC_HIDDEN; + const struct vkd3d_vulkan_procs_info *global_procs, VkInstance instance) DECLSPEC_HIDDEN; HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN; @@ -759,6 +760,5 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(const VkInstanceCreateInfo *crea 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); -VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *allocator); #endif /* __VKD3D_PRIVATE_H */ diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index 8875cb2..b1ec77d 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -44,6 +44,7 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) /* Device functions (obtained by vkGetDeviceProcAddr). */ +VK_DEVICE_PFN(vkDestroyDevice) /* Load vkDestroyDevice() first. */ VK_DEVICE_PFN(vkAllocateCommandBuffers) VK_DEVICE_PFN(vkAllocateDescriptorSets) VK_DEVICE_PFN(vkAllocateMemory) @@ -118,7 +119,6 @@ VK_DEVICE_PFN(vkDestroyBufferView) VK_DEVICE_PFN(vkDestroyCommandPool) VK_DEVICE_PFN(vkDestroyDescriptorPool) VK_DEVICE_PFN(vkDestroyDescriptorSetLayout) -VK_DEVICE_PFN(vkDestroyDevice) VK_DEVICE_PFN(vkDestroyEvent) VK_DEVICE_PFN(vkDestroyFence) VK_DEVICE_PFN(vkDestroyFramebuffer)

1 0

Józef Kucia : libs/vkd3d: Load libvulkan dynamically.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: 10b04414e835aef5f98734a15879874f76a90ba0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=10b04414e835aef5f98734a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:14 2018 +0100 libs/vkd3d: Load libvulkan dynamically. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- configure.ac | 5 +++++ libs/vkd3d/device.c | 34 ++++++++++++++++++++++++++++++---- libs/vkd3d/vkd3d_private.h | 10 +--------- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index f796bef..d8212b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,7 +89,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_private.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 libvkd3d_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map endif diff --git a/configure.ac b/configure.ac index b886058..8a39fef 100644 --- a/configure.ac +++ b/configure.ac @@ -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_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_CHECK_LIB([pthread], [pthread_create], [AC_SUBST([PTHREAD_LIBS], ["-lpthread"])], diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 62271db..7225320 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -18,6 +18,8 @@ #include "vkd3d_private.h" +#include <dlfcn.h> + struct vkd3d_optional_extension_info { 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; + instance->libvulkan = NULL; + if (vulkan_procs_info) { *procs = *vulkan_procs_info; return true; } - procs->vkCreateInstance = vkCreateInstance; - procs->vkDestroyInstance = vkDestroyInstance; - procs->vkGetInstanceProcAddr = vkGetInstanceProcAddr; - procs->vkEnumerateInstanceExtensionProperties = vkEnumerateInstanceExtensionProperties; + if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + { + ERR("Failed to load libvulkan.\n"); + 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; } @@ -248,6 +268,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, if ((vr = vk_global_procs->vkCreateInstance(&instance_info, NULL, &vk_instance))) { ERR("Failed to create Vulkan instance, vr %d.\n", vr); + if (instance->libvulkan) + dlclose(instance->libvulkan); 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); vk_global_procs->vkDestroyInstance(vk_instance, NULL); + if (instance->libvulkan) + dlclose(instance->libvulkan); 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; VK_CALL(vkDestroyInstance(instance->vk_instance, NULL)); + if (instance->libvulkan) + dlclose(instance->libvulkan); vkd3d_free(instance); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f32b64a..44d90b9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -88,6 +88,7 @@ struct vkd3d_instance struct vkd3d_vulkan_info vk_info; struct vkd3d_vulkan_procs_info vk_global_procs; + void *libvulkan; 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, 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 */

1 0

Józef Kucia : libs/vkd3d: Use vkGetInstanceProcAddr() to load global Vulkan functions.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: 783a2c2cdf9ba67d4093a864d6b8e4e87a3740f8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=783a2c2cdf9ba67d4093a86… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:15 2018 +0100 libs/vkd3d: Use vkGetInstanceProcAddr() to load global Vulkan functions. It's enough to load vkGetInstanceProcAddr() in a platform-specific way. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 12 ++----- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- libs/vkd3d/device.c | 64 +++++++++++++++++++------------------ libs/vkd3d/utils.c | 23 ++++++++++++- libs/vkd3d/vkd3d_private.h | 13 ++++++-- libs/vkd3d/vulkan_procs.h | 2 +- 6 files changed, 71 insertions(+), 45 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 5ae7603..8886499 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -43,21 +43,15 @@ typedef bool (*vkd3d_join_thread_pfn)(void *thread); struct vkd3d_instance; -struct vkd3d_vulkan_procs_info -{ - PFN_vkCreateInstance vkCreateInstance; - PFN_vkDestroyInstance vkDestroyInstance; - PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; - PFN_vkEnumerateInstanceExtensionProperties vkEnumerateInstanceExtensionProperties; -}; - struct vkd3d_instance_create_info { vkd3d_signal_event_pfn signal_event_pfn; vkd3d_create_thread_pfn create_thread_pfn; vkd3d_join_thread_pfn join_thread_pfn; size_t wchar_size; - const struct vkd3d_vulkan_procs_info *vulkan_procs_info; + + /* If set to NULL, libvkd3d loads libvulkan. */ + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr_pfn; }; struct vkd3d_device_create_info diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2ea0a16..f68c47b 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -41,7 +41,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, instance_create_info.create_thread_pfn = NULL; instance_create_info.join_thread_pfn = NULL; instance_create_info.wchar_size = sizeof(WCHAR); - instance_create_info.vulkan_procs_info = NULL; + instance_create_info.vkGetInstanceProcAddr_pfn = NULL; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = NULL; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7225320..b93c169 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -140,7 +140,7 @@ static unsigned int vkd3d_enable_extensions(const char *extensions[], static void vkd3d_init_instance_caps(struct vkd3d_instance *instance) { - const struct vkd3d_vulkan_procs_info *vk_procs = &instance->vk_global_procs; + const struct vkd3d_vk_global_procs *vk_procs = &instance->vk_global_procs; struct vkd3d_vulkan_info *vulkan_info = &instance->vk_info; VkExtensionProperties *vk_extensions; uint32_t count; @@ -173,46 +173,47 @@ static void vkd3d_init_instance_caps(struct vkd3d_instance *instance) vkd3d_free(vk_extensions); } -static bool vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, - const struct vkd3d_vulkan_procs_info *vulkan_procs_info) +static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) { - struct vkd3d_vulkan_procs_info *procs = &instance->vk_global_procs; - - instance->libvulkan = NULL; + HRESULT hr; - if (vulkan_procs_info) + if (!vkGetInstanceProcAddr) { - *procs = *vulkan_procs_info; - return true; - } + if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + { + ERR("Failed to load libvulkan.\n"); + return E_FAIL; + } - if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + if (!(vkGetInstanceProcAddr = dlsym(instance->libvulkan, "vkGetInstanceProcAddr"))) + { + ERR("Could not load function pointer for vkGetInstanceProcAddr().\n"); + dlclose(instance->libvulkan); + instance->libvulkan = NULL; + return E_FAIL; + } + } + else { - ERR("Failed to load libvulkan.\n"); - return false; + instance->libvulkan = NULL; } -#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; \ + if (FAILED(hr = vkd3d_load_vk_global_procs(&instance->vk_global_procs, vkGetInstanceProcAddr))) + { + if (instance->libvulkan) + dlclose(instance->libvulkan); + instance->libvulkan = NULL; + return hr; } - LOAD_PROC(vkCreateInstance) - LOAD_PROC(vkDestroyInstance) - LOAD_PROC(vkGetInstanceProcAddr) - LOAD_PROC(vkEnumerateInstanceExtensionProperties) -#undef LOAD_PROC - return true; + return S_OK; } static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { - const struct vkd3d_vulkan_procs_info *vk_global_procs = &instance->vk_global_procs; + const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs; const char *extensions[MAX_INSTANCE_EXTENSION_COUNT]; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; @@ -236,10 +237,10 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance->join_thread = create_info->join_thread_pfn; instance->wchar_size = create_info->wchar_size; - if (!vkd3d_init_vk_global_procs(instance, create_info->vulkan_procs_info)) + if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->vkGetInstanceProcAddr_pfn))) { - ERR("Failed to initialize Vulkan global procs.\n"); - return E_FAIL; + ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr); + return hr; } memset(&instance->vk_info, 0, sizeof(instance->vk_info)); @@ -276,7 +277,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, if (FAILED(hr = vkd3d_load_vk_instance_procs(&instance->vk_procs, vk_global_procs, vk_instance))) { ERR("Failed to load instance procs, hr %#x.\n", hr); - vk_global_procs->vkDestroyInstance(vk_instance, NULL); + if (instance->vk_procs.vkDestroyInstance) + instance->vk_procs.vkDestroyInstance(vk_instance, NULL); if (instance->libvulkan) dlclose(instance->libvulkan); return hr; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 84141aa..a326cae 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -350,6 +350,27 @@ HRESULT hresult_from_vk_result(VkResult vr) } } +#define LOAD_GLOBAL_PFN(name) \ + if (!(procs->name = (void *)vkGetInstanceProcAddr(NULL, #name))) \ + { \ + ERR("Could not get global proc addr for '" #name "'.\n"); \ + return E_FAIL; \ + } + +HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) +{ + memset(procs, 0, sizeof(*procs)); + + procs->vkGetInstanceProcAddr = vkGetInstanceProcAddr; + + LOAD_GLOBAL_PFN(vkCreateInstance) + LOAD_GLOBAL_PFN(vkEnumerateInstanceExtensionProperties) + + TRACE("Loaded global Vulkan procs.\n"); + return S_OK; +} + #define LOAD_INSTANCE_PFN(name) \ if (!(procs->name = (void *)global_procs->vkGetInstanceProcAddr(instance, #name))) \ { \ @@ -358,7 +379,7 @@ HRESULT hresult_from_vk_result(VkResult vr) } HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, - const struct vkd3d_vulkan_procs_info *global_procs, VkInstance instance) + const struct vkd3d_vk_global_procs *global_procs, VkInstance instance) { memset(procs, 0, sizeof(*procs)); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 44d90b9..f4bae9d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -49,6 +49,13 @@ struct d3d12_command_list; struct d3d12_device; +struct vkd3d_vk_global_procs +{ + PFN_vkCreateInstance vkCreateInstance; + PFN_vkEnumerateInstanceExtensionProperties vkEnumerateInstanceExtensionProperties; + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; +}; + #define DECLARE_VK_PFN(name) PFN_##name name; struct vkd3d_vk_instance_procs { @@ -87,7 +94,7 @@ struct vkd3d_instance size_t wchar_size; struct vkd3d_vulkan_info vk_info; - struct vkd3d_vulkan_procs_info vk_global_procs; + struct vkd3d_vk_global_procs vk_global_procs; void *libvulkan; LONG refcount; @@ -748,8 +755,10 @@ const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; +HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN; HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, - const struct vkd3d_vulkan_procs_info *global_procs, VkInstance instance) DECLSPEC_HIDDEN; + const struct vkd3d_vk_global_procs *global_procs, VkInstance instance) DECLSPEC_HIDDEN; HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index b1ec77d..cbdcda8 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -29,8 +29,8 @@ #endif /* Instance functions (obtained by vkGetInstanceProcAddr). */ +VK_INSTANCE_PFN(vkDestroyInstance) /* Load vkDestroyInstance() first. */ VK_INSTANCE_PFN(vkCreateDevice) -VK_INSTANCE_PFN(vkDestroyInstance) VK_INSTANCE_PFN(vkEnumerateDeviceExtensionProperties) VK_INSTANCE_PFN(vkEnumerateDeviceLayerProperties) VK_INSTANCE_PFN(vkEnumeratePhysicalDevices)

1 0

Francois Gouget : testbot: Return the activity records as a sorted list.
by Alexandre Julliard 17 Jan '18

17 Jan '18

Module: tools Branch: master Commit: dfff27816fb06dadd5b07b94d64c5e7ef3096155 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dfff27816fb06dadd5b07b9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 17 01:22:58 2018 +0100 testbot: Return the activity records as a sorted list. The callers need a sorted list rather than a random access structure. So this avoids forcing them to deal with sorting the activity records again and mildly speeds things up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 33 ++++++++++++++++++--------------- testbot/web/Activity.pl | 4 ++-- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5a5d232..58169ae 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -44,9 +44,13 @@ require Exporter; =item C<GetActivity()> Loads the records for the specified VMs and processes them to build a structure -describing the TestBot activity. The structure is as follows: +describing the TestBot activity. - { <GroupNo1> => { +Returns a list of the activity records, sorted from the oldest to the newest. +Each entry contains a structure grouping all the state and event information +for the specified timestamp. Entries have the following structure: + + { start => <StartTimestamp>, end => <EndTimestamp>, runnable => <RunnableTasksCount>, @@ -78,12 +82,10 @@ describing the TestBot activity. The structure is as follows: ... }, }, - }, - <GroupNo2> => { - ... - }, - ... - } + } + +GetActivity() also returns a table with the number of records and record groups +that were processed. =back =cut @@ -91,14 +93,16 @@ describing the TestBot activity. The structure is as follows: sub GetActivity($) { my ($VMs) = @_; - my ($Activity, $Counters) = ({}, {}); + my ($ActivityHash, $Activity, $Counters) = ({}, [], {}); ### First load all the RecordGroups my $RecordGroups = CreateRecordGroups(); $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); - foreach my $RecordGroup (@{$RecordGroups->GetItems()}) + foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) { - $Activity->{$RecordGroup->Id} = { start => $RecordGroup->Timestamp }; + my $Group = { start => $RecordGroup->Timestamp }; + $ActivityHash->{$RecordGroup->Id} = $Group; + push @$Activity, $Group; } ### And then load all the Records in one go @@ -110,7 +114,7 @@ sub GetActivity($) $Counters->{records} = $Records->GetItemsCount(); foreach my $Record (@{$Records->GetItems()}) { - my $Group = $Activity->{$Record->RecordGroupId}; + my $Group = $ActivityHash->{$Record->RecordGroupId}; if ($Record->Type eq "tasks" and $Record->Name eq "counters") { ($Group->{runnable}, $Group->{queued}) = split / /, $Record->Value; @@ -196,9 +200,8 @@ sub GetActivity($) ### Fill the holes in the table, compute end times, etc. my ($LastGroup, %LastStatusVMs); - foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) + foreach my $Group (@$Activity) { - my $Group = $Activity->{$RecordGroup->Id}; my $StatusVMs = $Group->{statusvms}; my $ResultVMs = $Group->{resultvms}; next if (!$StatusVMs and !$ResultVMs); @@ -380,7 +383,7 @@ sub GetStatistics($) my ($Activity, $Counters) = GetActivity($VMs); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; - foreach my $Group (values %$Activity) + foreach my $Group (@$Activity) { if (!$VMsStats->{start} or $VMsStats->{start} > $Group->{start}) { diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5a730df..f8b7b5a 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -133,9 +133,9 @@ EOF print "<tbody>\n"; my ($Activity, $_Counters) = GetActivity($VMs); - foreach my $GroupNo (sort { $b <=> $a } keys %$Activity) + for (my $Index = @$Activity; $Index--; ) { - my $Group = $Activity->{$GroupNo}; + my $Group = $Activity->[$Index]; next if (!$Group->{statusvms}); print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>";

1 0

Francois Gouget : testbot/Janitor: Don' t undefine variables that are going out of scope.
by Alexandre Julliard 17 Jan '18

17 Jan '18

Module: tools Branch: master Commit: ac81f268a30b068320468aca88d857924ab06e32 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ac81f268a30b068320468ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 17 01:23:16 2018 +0100 testbot/Janitor: Don't undefine variables that are going out of scope. There is no point. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 4f0e4de..6ac22de 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -72,7 +72,6 @@ if ($JobPurgeDays != 0) } } } - $Jobs = undef; } # Delete PatchSets that are more than a day old @@ -123,7 +122,6 @@ if ($JobPurgeDays != 0) } } } - $Patches = undef; } # Archive old Jobs, that is remove all their associated files @@ -146,7 +144,6 @@ if ($JobArchiveDays != 0) $Job->Save(); } } - $Jobs = undef; } # Purge the deleted users and VMs if they are not referenced anymore @@ -286,5 +283,4 @@ if ($JobPurgeDays != 0) } } } - $RecordGroups = undef; }

1 0

Francois Gouget : testbot: Fix the CompareRecordGroups() documentation and variable names.
by Alexandre Julliard 17 Jan '18

17 Jan '18

Module: tools Branch: master Commit: 2ee6ee59d76c3935b1279977a4ff786b2deb7556 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2ee6ee59d76c3935b127997… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 17 01:23:05 2018 +0100 testbot: Fix the CompareRecordGroups() documentation and variable names. The RecordGroup Id is an AUTO_INCREMENT field. These never wrap! Also, while that field is defined as an INT(6), it is a 32 bit integer anyway so we will not run out of ids for a long time. Generally speaking, for integers the display width (6 here) is meaningless as far as the TestBot is concerned. Also use more descriptive variable names. $a and $b were a bit misleading too since they have special meaning in the context of the sort() function, meaning which they don't have here. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/RecordGroups.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index fc1c252..707d0ac 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -95,12 +95,12 @@ sub CreateRecordGroups(;$) sub CompareRecordGroups($$) { - my ($a, $b) = @_; + my ($RecordGroup1, $RecordGroup2) = @_; - # The Id will wrap eventually so sort by Timestamp - # and only use the Id to break ties. - return $a->Timestamp <=> $b->Timestamp || - $a->Id <=> $b->Id; + # The Timestamps have a 1 second granularity and may have duplicates. + # So use the Id to break ties. + return $RecordGroup1->Timestamp <=> $RecordGroup2->Timestamp || + $RecordGroup1->Id <=> $RecordGroup2->Id; } =pod

1 0

Józef Kucia : libs/vkd3d-shader: Fix uninitialized error code in vkd3d_shader_parser_init().
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 9e8dc13ba3f82b799c875e4423ea06fda49d9faa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9e8dc13ba3f82b799c875e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:21 2018 +0100 libs/vkd3d-shader: Fix uninitialized error code in vkd3d_shader_parser_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6522dd6..bf1a391 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,9 +41,9 @@ static HRESULT vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, if (!(parser->data = shader_sm4_init(shader_desc->byte_code, shader_desc->byte_code_size, &shader_desc->output_signature))) { - WARN("Failed to initialize shader parser, hr %#x.\n", hr); + WARN("Failed to initialize shader parser.\n"); free_shader_desc(shader_desc); - return hr; + return E_INVALIDARG; } shader_sm4_read_header(parser->data, &parser->ptr, &parser->shader_version);

1 0

Józef Kucia : libs/vkd3d: Get rid of vkd3d_get_vk_queue().
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 55025f7bec02f0973663a949f54846ddedc611c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=55025f7bec02f0973663a94… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:22 2018 +0100 libs/vkd3d: Get rid of vkd3d_get_vk_queue(). Replaced by vkd3d_acquire_vk_queue(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 1 - libs/vkd3d/command.c | 7 ------- libs/vkd3d/vkd3d.map | 1 - 3 files changed, 9 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 322675b..320282b 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -75,7 +75,6 @@ VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); -VkQueue vkd3d_get_vk_queue(ID3D12CommandQueue *queue); void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7aa1386..3b7d2ee 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4380,13 +4380,6 @@ HRESULT d3d12_command_queue_create(struct d3d12_device *device, return S_OK; } -VkQueue vkd3d_get_vk_queue(ID3D12CommandQueue *queue) -{ - struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); - - return d3d12_queue->vkd3d_queue->vk_queue; -} - uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue) { struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 57b8606..0c0d768 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -9,7 +9,6 @@ global: vkd3d_get_vk_format; vkd3d_get_vk_instance; vkd3d_get_vk_physical_device; - vkd3d_get_vk_queue; vkd3d_get_vk_queue_family_index; vkd3d_instance_decref; vkd3d_instance_incref;

1 0

Józef Kucia : include: Allow using libvkd3d with custom Vulkan headers.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 1fbacd5a09dd16dd1a0eb999d3e5bd8c7d99c9d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fbacd5a09dd16dd1a0eb99… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:23 2018 +0100 include: Allow using libvkd3d with custom Vulkan headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 320282b..a70bd2d 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -24,7 +24,10 @@ # include "vkd3d_d3d12.h" #endif /* VKD3D_NO_WIN32_TYPES */ -#include <vulkan/vulkan.h> +#ifndef VKD3D_NO_VULKAN_H +# include <vulkan/vulkan.h> +#endif /* VKD3D_NO_VULKAN_H */ + #include <stdbool.h> #ifdef __cplusplus

1 0

Józef Kucia : tests: Fix copy-paste mistakes.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 44aad2a938afe76dd9d3d8ebc1df585eb1b0e3a2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=44aad2a938afe76dd9d3d8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:24 2018 +0100 tests: Fix copy-paste mistakes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/vkd3d_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 146467a..7ca5d26 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -151,9 +151,9 @@ static void test_vkd3d_queue(void) direct_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT); ok(direct_queue, "Failed to create direct command queue.\n"); compute_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE); - ok(compute_queue, "Failed to create direct command queue.\n"); + ok(compute_queue, "Failed to create compute command queue.\n"); copy_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COPY); - ok(copy_queue, "Failed to create direct command queue.\n"); + ok(copy_queue, "Failed to create copy command queue.\n"); vk_queue_family = vkd3d_get_vk_queue_family_index(direct_queue); trace("Direct queue family index %u.\n", vk_queue_family);

1 0