March 2018 - Wine-commits - list.winehq.org

Roderick Colenbrander : winevulkan: Implement vkQueuePresentInfoKHR.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: fc0af22d9aad6de53f06b37568b985616da4207f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc0af22d9aad6de53f06b375… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:35 2018 -0700 winevulkan: Implement vkQueuePresentInfoKHR. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 08a957b..8547531 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -933,8 +933,8 @@ VkResult WINAPI wine_vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swa VkResult WINAPI wine_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { - FIXME("stub: %p, %p\n", queue, present_info); - return VK_ERROR_OUT_OF_HOST_MEMORY; + TRACE("%p, %p\n", queue, present_info); + return vk_funcs->p_vkQueuePresentKHR(queue->queue, present_info); } void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name)

1 0

Roderick Colenbrander : winevulkan: Implement vkQueueBindSparse and vkQueueWaitIdle.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: f90940dac23ff50d605a95258a2c8697e9fc12d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f90940dac23ff50d605a9525… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:36 2018 -0700 winevulkan: Implement vkQueueBindSparse and vkQueueWaitIdle. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +---- dlls/winevulkan/vulkan_thunks.c | 210 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 60 ++++++++++++ 3 files changed, 268 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f90940dac23ff50d605a…

1 0

Roderick Colenbrander : winevulkan: Filter graphics driver reported instance extensions.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 8ef70305f9e4c785331a9b7c0fc672dbf6f4430b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ef70305f9e4c785331a9b7c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:37 2018 -0700 winevulkan: Filter graphics driver reported instance extensions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 23 +++++++++++++- dlls/winevulkan/vulkan.c | 67 ++++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++ dlls/winevulkan/vulkan_thunks.h | 1 + dlls/winex11.drv/vulkan.c | 60 ++++++++++++++++++++++++++++-------- 5 files changed, 153 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ef70305f9e4c785331a…

1 0

Roderick Colenbrander : winevulkan: Implement VK_KHR_get_physical_device_properties2.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 79c2ee529b530fa49fae0d3ded4d4d3d6e09d7b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c2ee529b530fa49fae0d3d… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:38 2018 -0700 winevulkan: Implement VK_KHR_get_physical_device_properties2. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan_thunks.c | 133 ++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 49 +++++- include/wine/vulkan.h | 377 ++++++++++++++++++++++++---------------- 4 files changed, 414 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79c2ee529b530fa49fae…

1 0

Roderick Colenbrander : winevulkan: Support various device extensions.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 3fcec7cf7853bb60267bee324d0ef8a22eb5edf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fcec7cf7853bb60267bee32… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:40 2018 -0700 winevulkan: Support various device extensions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 49 ++++++- dlls/winevulkan/vulkan_thunks.c | 313 ++++++++++++++++++++++++++++------------ dlls/winevulkan/vulkan_thunks.h | 98 +++++++++---- include/wine/vulkan.h | 81 +++++++++++ 4 files changed, 419 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fcec7cf7853bb60267b…

1 0

Roderick Colenbrander : winevulkan: Allow vkGetDeviceProcAddr to load instance functions for broken games.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 76275505e0f05113b4be7851f2d877e1f1ee4cfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=76275505e0f05113b4be7851… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 15 10:26:32 2018 +0100 winevulkan: Allow vkGetDeviceProcAddr to load instance functions for broken games. Doom and Wolfenstein II use vkGetDeviceProcAddr to load all their function pointers, while they are supposed to use vkGetInstanceProcAddr for the instance ones. For now we need to allow this broken behavior. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c0fc810..5062701 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -902,7 +902,26 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * if (func) return func; - TRACE("Function %s not found\n", debugstr_a(name)); + /* vkGetDeviceProcAddr was intended for loading device and subdevice functions. + * idTech 6 titles such as Doom and Wolfenstein II, however use it also for + * loading of instance functions. This is undefined behavior as the specification + * disallows using any of the returned function pointers outside of device / + * subdevice objects. The games don't actually use the function pointers and if they + * did, they would crash as VkInstance / VkPhysicalDevice parameters need unwrapping. + * Khronos clarified behavior in the Vulkan spec and expects drivers to get updated, + * however it would require both driver and game fixes. Since it are major titles + * it is not clear what will happen. At least for now we need the hack below. + * https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/2323 + * https://github.com/KhronosGroup/Vulkan-Docs/issues/655 + */ + func = wine_vk_get_instance_proc_addr(name); + if (func) + { + WARN("Returning instance function '%s'.\n", debugstr_a(name)); + return func; + } + + TRACE("Function %s not found.\n", debugstr_a(name)); return NULL; }

1 0

Józef Kucia : winevulkan: Simplify wine_vkEnumeratePhysicalDevices().
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 32eef26a7dbbd755d20494454e3b657c48ba1bc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32eef26a7dbbd755d2049445… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 15 10:26:33 2018 +0100 winevulkan: Simplify wine_vkEnumeratePhysicalDevices(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 5062701..b9326ba 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -838,42 +838,27 @@ static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *l return res; } -VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *device_count, +VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *count, VkPhysicalDevice *devices) { - VkResult res; - unsigned int i, num_copies; + unsigned int i; - TRACE("%p %p %p\n", instance, device_count, devices); + TRACE("%p %p %p\n", instance, count, devices); if (!devices) { - *device_count = instance->num_phys_devs; + *count = instance->num_phys_devs; return VK_SUCCESS; } - if (*device_count < instance->num_phys_devs) - { - /* Incomplete is a type of success used to signal the application - * that not all devices got copied. - */ - num_copies = *device_count; - res = VK_INCOMPLETE; - } - else - { - num_copies = instance->num_phys_devs; - res = VK_SUCCESS; - } - - for (i = 0; i < num_copies; i++) + *count = min(*count, instance->num_phys_devs); + for (i = 0; i < *count; i++) { devices[i] = instance->phys_devs[i]; } - *device_count = num_copies; - TRACE("Returning %u devices\n", *device_count); - return res; + TRACE("Returning %u devices.\n", *count); + return *count < instance->num_phys_devs ? VK_INCOMPLETE : VK_SUCCESS; } void WINAPI wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool pool, uint32_t count,

1 0

Francois Gouget : testbot: Tweak the placement of the package POD documentation.
by Alexandre Julliard 15 Mar '18

15 Mar '18

Module: tools Branch: master Commit: 8fa90163af7a8dd7f6e7fcdbf3299c3ec7e84a9f URL: https://source.winehq.org/git/tools.git/?a=commit;h=8fa90163af7a8dd7f6e7fcd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 15 01:18:25 2018 +0100 testbot: Tweak the placement of the package POD documentation. Alway put it right after the package statement. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 4 ++-- testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/FreeFormPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/Page.pm | 4 ++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- testbot/lib/WineTestBot/CGI/Sessions.pm | 15 +++++++++++---- testbot/lib/WineTestBot/Engine/Events.pm | 4 ++-- testbot/lib/WineTestBot/Engine/Notify.pm | 4 ++-- 11 files changed, 31 insertions(+), 24 deletions(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index fd19794..4c3382c 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -18,6 +18,8 @@ use strict; +package ObjectModel::BasicPropertyDescriptor; + =head1 NAME ObjectModel::BasicPropertyDescriptor - Defines a basic property @@ -28,8 +30,6 @@ This handles the boolean, a number and string columns. =cut -package ObjectModel::BasicPropertyDescriptor; - use ObjectModel::PropertyDescriptor; use vars qw(@ISA @EXPORT); diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index f890315..3dd8154 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -19,14 +19,14 @@ use strict; +package ObjectModel::CGI::CollectionBlockForPage; + =head1 NAME ObjectModel::CGI::CollectionBlockForPage - Collection block for list pages =cut -package ObjectModel::CGI::CollectionBlockForPage; - use ObjectModel::CGI::CollectionBlock; use vars qw(@ISA @EXPORT); diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 11f0300..e45b2a4 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -19,14 +19,14 @@ use strict; +package ObjectModel::CGI::CollectionPage; + =head1 NAME ObjectModel::CGI::CollectionPage - Base class for list pages =cut -package ObjectModel::CGI::CollectionPage; - use ObjectModel::CGI::CollectionBlockForPage; use ObjectModel::CGI::Page; diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 7489f83..7669067 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -20,14 +20,14 @@ use strict; +package ObjectModel::CGI::FormPage; + =head1 NAME ObjectModel::CGI::FormPage - Base class for web forms =cut -package ObjectModel::CGI::FormPage; - use ObjectModel::CGI::Page; use vars qw(@ISA @EXPORT); diff --git a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm index 607fd7b..7af04c4 100644 --- a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm @@ -19,14 +19,14 @@ use strict; +package ObjectModel::CGI::FreeFormPage; + =head1 NAME ObjectModel::CGI::FreeFormPage - Base class for unbound web forms =cut -package ObjectModel::CGI::FreeFormPage; - use ObjectModel::CGI::FormPage; use vars qw(@ISA @EXPORT); diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index a07f02b..74ce14e 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -20,14 +20,14 @@ use strict; +package ObjectModel::CGI::ItemPage; + =head1 NAME ObjectModel::CGI::ItemPage - Base class for bound web forms =cut -package ObjectModel::CGI::ItemPage; - use URI::Escape; use ObjectModel::CGI::FormPage; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 50598bf..ff7e848 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -19,14 +19,14 @@ use strict; +package ObjectModel::CGI::Page; + =head1 NAME ObjectModel::CGI::Page - Base class for web pages =cut -package ObjectModel::CGI::Page; - use CGI; use vars qw(@ISA @EXPORT $PageBaseCreator); diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 1490090..fa383c5 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -20,14 +20,14 @@ use strict; +package WineTestBot::CGI::PageBase; + =head1 NAME WineTestBot::CGI::PageBase - Base class for web pages =cut -package WineTestBot::CGI::PageBase; - use Apache2::Const -compile => qw(REDIRECT); use Apache2::ServerRec; use CGI::Cookie; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index f9f791d..4b1f6b3 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -19,14 +19,14 @@ use strict; -=head1 NAME -WineTestBot::CGI::Sessions - Session collection +package WineTestBot::CGI::Session; -=cut +=head1 NAME +WineTestBot::CGI::Session - A web user's session -package WineTestBot::CGI::Session; +=cut use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; @@ -44,8 +44,15 @@ sub InitializeNew($$) $self->Permanent(!1); } + package WineTestBot::CGI::Sessions; +=head1 NAME + +WineTestBot::CGI::Sessions - A Session collection + +=cut + use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index 36895f4..c3ebe9b 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -19,14 +19,14 @@ use strict; +package WineTestBot::Engine::Events; + =head1 NAME WineTestBot::Engine::Events - Engine events =cut -package WineTestBot::Engine::Events; - use vars qw (@ISA @EXPORT); require Exporter; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 5ae6634..c277f7a 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -19,14 +19,14 @@ use strict; +package WineTestBot::Engine::Notify; + =head1 NAME WineTestBot::Engine::Notify - Engine notification =cut -package WineTestBot::Engine::Notify; - use Socket; use WineTestBot::Config;

1 0

Roderick Colenbrander : winevulkan: Implement vkGetDeviceQueue.
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: 9721ec92b9b7a764ce140e26560d7254ed3065b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9721ec92b9b7a764ce140e26… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 13:11:52 2018 +0100 winevulkan: Implement vkGetDeviceQueue. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 +- dlls/winevulkan/vulkan.c | 84 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 11 ++++++ dlls/winevulkan/vulkan_thunks.c | 5 --- dlls/winevulkan/vulkan_thunks.h | 1 + 5 files changed, 95 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b53203b..abcd425 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -113,6 +113,7 @@ FUNCTION_OVERRIDES = { # Device functions "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : False}, + "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : False}, # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, @@ -396,9 +397,6 @@ class VkFunction(object): if self.name == "vkCreateSwapchainKHR": return False - if self.params[0].type != "VkPhysicalDevice": - return True - if self.is_device_func(): return True diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 7b0fb37..e6873e8 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -52,6 +52,36 @@ static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev); static const struct vulkan_funcs *vk_funcs = NULL; +/* Helper function to create queues for a given family index. */ +static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, + uint32_t family_index, uint32_t queue_count) +{ + struct VkQueue_T *queues; + unsigned int i; + + if (!(queues = heap_calloc(queue_count, sizeof(*queues)))) + { + ERR("Failed to allocate memory for queues\n"); + return NULL; + } + + for (i = 0; i < queue_count; i++) + { + struct VkQueue_T *queue = &queues[i]; + queue->device = device; + + /* The native device was already allocated with the required number of queues, + * so just fetch them from there. + */ + device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); + + /* Set special header for ICD loader. */ + ((struct wine_vk_base *)queue)->loader_magic = VULKAN_ICD_MAGIC_VALUE; + } + + return queues; +} + /* Helper function used for freeing a device structure. This function supports full * and partial object cleanups and can thus be used for vkCreateDevice failures. */ @@ -60,6 +90,17 @@ static void wine_vk_device_free(struct VkDevice_T *device) if (!device) return; + if (device->queues) + { + unsigned int i; + for (i = 0; i < device->max_queue_families; i++) + { + heap_free(device->queues[i]); + } + heap_free(device->queues); + device->queues = NULL; + } + if (device->device && device->funcs.p_vkDestroyDevice) { device->funcs.p_vkDestroyDevice(device->device, NULL /* pAllocator */); @@ -328,14 +369,14 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkAllocationCallbacks *allocator, VkDevice *device) { struct VkDevice_T *object = NULL; + uint32_t max_queue_families; VkResult res; + unsigned int i; TRACE("%p %p %p %p\n", phys_dev, create_info, allocator, device); if (allocator) - { FIXME("Support for allocation callbacks not implemented yet\n"); - } object = heap_alloc_zero(sizeof(*object)); if (!object) @@ -367,6 +408,37 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, ALL_VK_DEVICE_FUNCS() #undef USE_VK_FUNC + /* We need to cache all queues within the device as each requires wrapping since queues are + * dispatchable objects. + */ + phys_dev->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(phys_dev->phys_dev, + &max_queue_families, NULL); + object->max_queue_families = max_queue_families; + TRACE("Max queue families: %d\n", object->max_queue_families); + + object->queues = heap_calloc(max_queue_families, sizeof(*object->queues)); + if (!object->queues) + { + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + for (i = 0; i < create_info->queueCreateInfoCount; i++) + { + uint32_t family_index = create_info->pQueueCreateInfos[i].queueFamilyIndex; + uint32_t queue_count = create_info->pQueueCreateInfos[i].queueCount; + + TRACE("queueFamilyIndex %u, queueCount %u\n", family_index, queue_count); + + object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, queue_count); + if (!object->queues[family_index]) + { + res = VK_ERROR_OUT_OF_HOST_MEMORY; + ERR("Failed to allocate memory for queues\n"); + goto err; + } + } + *device = object; return VK_SUCCESS; @@ -660,6 +732,14 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * return NULL; } +void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, + uint32_t queue_index, VkQueue *queue) +{ + TRACE("%p %u %u %p\n", device, family_index, queue_index, queue); + + *queue = &device->queues[family_index][queue_index]; +} + static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) { void *func; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index d49366f..203ad12 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -53,6 +53,10 @@ struct VkDevice_T struct wine_vk_base base; struct vulkan_device_funcs funcs; struct VkPhysicalDevice_T *phys_dev; /* parent */ + + uint32_t max_queue_families; + struct VkQueue_T **queues; + VkDevice device; /* native device */ }; @@ -81,4 +85,11 @@ struct VkPhysicalDevice_T VkPhysicalDevice phys_dev; /* native physical device */ }; +struct VkQueue_T +{ + struct wine_vk_base base; + VkDevice device; /* parent */ + VkQueue queue; /* native queue */ +}; + #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index dfda842..ba8b689 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -685,11 +685,6 @@ static void WINAPI wine_vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMem FIXME("stub: %p, 0x%s, %p\n", device, wine_dbgstr_longlong(memory), pCommittedMemoryInBytes); } -static void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue) -{ - FIXME("stub: %p, %u, %u, %p\n", device, queueFamilyIndex, queueIndex, pQueue); -} - static VkResult WINAPI wine_vkGetEventStatus(VkDevice device, VkEvent event) { FIXME("stub: %p, 0x%s\n", device, wine_dbgstr_longlong(event)); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 13c1228..7be86bf 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -26,6 +26,7 @@ void WINAPI wine_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN; PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *pName) DECLSPEC_HIDDEN; +void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pSurfaceFormatCount, VkSurfaceFormatKHR *pSurfaceFormats) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pPresentModeCount, VkPresentModeKHR *pPresentModes) DECLSPEC_HIDDEN;

1 0

Roderick Colenbrander : winevulkan: Implement various device functions.
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: 2657bffeabd6ce62acfbe5b65a5e3dcd34f9f719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2657bffeabd6ce62acfbe5b6… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 13:11:53 2018 +0100 winevulkan: Implement various device functions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 20 +- dlls/winevulkan/vulkan_thunks.c | 753 ++++++++++++++++++++++++++++++++++------ dlls/winevulkan/vulkan_thunks.h | 232 +++++++++++++ 3 files changed, 896 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2657bffeabd6ce62acfb…

1 0