[PATCH] winevulkan: Use native vkGetPhysicalDeviceProperties in wine_vkCreateDevice.

[Jacek Caban]

On 5/19/21 8:36 PM, Georg Lehmann wrote:
>
>
> On 19.05.21 20:23, Jacek Caban wrote:
>> Signed-off-by: Jacek Caban <jacek at codeweavers.com>
>> ---
>>   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 9f181d92bc5..ba492d32204 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) \
>> @@ -701,9 +698,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);
>
> &properties does not have the correct pointer type on x86_64.


Yeah, I realized that after sending the patch. I sent a fixed version.


Thanks,

Jacek