Module: wine Branch: master Commit: 272542f4965067b91288ab678ac3987824c94dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=272542f4965067b91288ab678...
Author: Jacek Caban jacek@codeweavers.com Date: Mon May 31 16:17:31 2021 +0200
winevulkan: Directly use host vkGetPhysicalDeviceProperties in wine_vkCreateDevice.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winevulkan/vulkan.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1c985aaf03c..bdd9f2151c0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -70,9 +70,6 @@ static uint32_t wine_vk_count_struct_(void *s, VkStructureType t) static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version);
-void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, - VkPhysicalDeviceProperties *properties); - #define WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, object, native_handle) \ wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (uintptr_t) (native_handle), &(object)->mapping) #define WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, native_handle) \ @@ -694,9 +691,9 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev,
if (TRACE_ON(vulkan)) { - VkPhysicalDeviceProperties properties; + VkPhysicalDeviceProperties_host properties;
- wine_vkGetPhysicalDeviceProperties(phys_dev, &properties); + phys_dev->instance->funcs.p_vkGetPhysicalDeviceProperties(phys_dev->phys_dev, &properties);
TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); TRACE("Vendor ID: %#x, Device ID: %#x.\n", properties.vendorID, properties.deviceID);