[PATCH v2 0/3] MR9202: win32u: Move LUID handling from winevulkan.
-- v2: winevulkan: Use generated PE thunks for vkGetPhysicalDeviceProperties2[KHR]. win32u: Move LUID handling from winevulkan. https://gitlab.winehq.org/wine/wine/-/merge_requests/9202
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/vulkan.c | 16 ++++++++++++++++ dlls/winevulkan/make_vulkan | 2 ++ dlls/winevulkan/vulkan_thunks.c | 8 ++++---- include/wine/vulkan_driver.h | 2 ++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index bb660fd5d0c..45ed31606dd 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -1002,6 +1002,20 @@ static VkResult win32u_vkGetPhysicalDevicePresentRectanglesKHR( VkPhysicalDevice surface->obj.host.surface, rect_count, rects ); } +static void win32u_vkGetPhysicalDeviceProperties2( VkPhysicalDevice client_physical_device, VkPhysicalDeviceProperties2 *properties2 ) +{ + struct vulkan_physical_device *physical_device = vulkan_physical_device_from_handle( client_physical_device ); + + physical_device->instance->p_vkGetPhysicalDeviceProperties2( physical_device->host.physical_device, properties2 ); +} + +static void win32u_vkGetPhysicalDeviceProperties2KHR( VkPhysicalDevice client_physical_device, VkPhysicalDeviceProperties2 *properties2 ) +{ + struct vulkan_physical_device *physical_device = vulkan_physical_device_from_handle( client_physical_device ); + + physical_device->instance->p_vkGetPhysicalDeviceProperties2KHR( physical_device->host.physical_device, properties2 ); +} + static VkResult win32u_vkGetPhysicalDeviceSurfaceFormatsKHR( VkPhysicalDevice client_physical_device, VkSurfaceKHR client_surface, uint32_t *format_count, VkSurfaceFormatKHR *formats ) { @@ -1833,6 +1847,8 @@ static struct vulkan_funcs vulkan_funcs = .p_vkGetPhysicalDeviceImageFormatProperties2 = win32u_vkGetPhysicalDeviceImageFormatProperties2, .p_vkGetPhysicalDeviceImageFormatProperties2KHR = win32u_vkGetPhysicalDeviceImageFormatProperties2, .p_vkGetPhysicalDevicePresentRectanglesKHR = win32u_vkGetPhysicalDevicePresentRectanglesKHR, + .p_vkGetPhysicalDeviceProperties2 = win32u_vkGetPhysicalDeviceProperties2, + .p_vkGetPhysicalDeviceProperties2KHR = win32u_vkGetPhysicalDeviceProperties2KHR, .p_vkGetPhysicalDeviceSurfaceCapabilities2KHR = win32u_vkGetPhysicalDeviceSurfaceCapabilities2KHR, .p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = win32u_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, .p_vkGetPhysicalDeviceSurfaceFormats2KHR = win32u_vkGetPhysicalDeviceSurfaceFormats2KHR, diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 48a0134a092..12da96e2c37 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -226,6 +226,8 @@ USER_DRIVER_FUNCS = { "vkGetPhysicalDeviceImageFormatProperties2", "vkGetPhysicalDeviceImageFormatProperties2KHR", "vkGetPhysicalDevicePresentRectanglesKHR", + "vkGetPhysicalDeviceProperties2", + "vkGetPhysicalDeviceProperties2KHR", "vkGetPhysicalDeviceSurfaceCapabilities2KHR", "vkGetPhysicalDeviceSurfaceCapabilitiesKHR", "vkGetPhysicalDeviceSurfaceFormats2KHR", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index ba79adb23db..7f902f8ad47 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -57021,7 +57021,7 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pProperties); - vulkan_physical_device_from_handle(params->physicalDevice)->instance->p_vkGetPhysicalDeviceProperties2(vulkan_physical_device_from_handle(params->physicalDevice)->host.physical_device, params->pProperties); + vk_funcs->p_vkGetPhysicalDeviceProperties2(params->physicalDevice, params->pProperties); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -57041,7 +57041,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2(void *args) init_conversion_context(ctx); convert_VkPhysicalDeviceProperties2_win32_to_host(ctx, (VkPhysicalDeviceProperties232 *)UlongToPtr(params->pProperties), &pProperties_host); - vulkan_physical_device_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->p_vkGetPhysicalDeviceProperties2(vulkan_physical_device_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->host.physical_device, &pProperties_host); + vk_funcs->p_vkGetPhysicalDeviceProperties2((VkPhysicalDevice)UlongToPtr(params->physicalDevice), &pProperties_host); convert_VkPhysicalDeviceProperties2_host_to_win32(&pProperties_host, (VkPhysicalDeviceProperties232 *)UlongToPtr(params->pProperties)); free_conversion_context(ctx); return STATUS_SUCCESS; @@ -57054,7 +57054,7 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2KHR(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pProperties); - vulkan_physical_device_from_handle(params->physicalDevice)->instance->p_vkGetPhysicalDeviceProperties2KHR(vulkan_physical_device_from_handle(params->physicalDevice)->host.physical_device, params->pProperties); + vk_funcs->p_vkGetPhysicalDeviceProperties2KHR(params->physicalDevice, params->pProperties); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -57074,7 +57074,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2KHR(void *args) init_conversion_context(ctx); convert_VkPhysicalDeviceProperties2_win32_to_host(ctx, (VkPhysicalDeviceProperties232 *)UlongToPtr(params->pProperties), &pProperties_host); - vulkan_physical_device_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->p_vkGetPhysicalDeviceProperties2KHR(vulkan_physical_device_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->host.physical_device, &pProperties_host); + vk_funcs->p_vkGetPhysicalDeviceProperties2KHR((VkPhysicalDevice)UlongToPtr(params->physicalDevice), &pProperties_host); convert_VkPhysicalDeviceProperties2_host_to_win32(&pProperties_host, (VkPhysicalDeviceProperties232 *)UlongToPtr(params->pProperties)); free_conversion_context(ctx); return STATUS_SUCCESS; diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index be2f5296082..54570c3e017 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -239,6 +239,8 @@ struct vulkan_funcs PFN_vkGetPhysicalDeviceImageFormatProperties2 p_vkGetPhysicalDeviceImageFormatProperties2; PFN_vkGetPhysicalDeviceImageFormatProperties2KHR p_vkGetPhysicalDeviceImageFormatProperties2KHR; PFN_vkGetPhysicalDevicePresentRectanglesKHR p_vkGetPhysicalDevicePresentRectanglesKHR; + PFN_vkGetPhysicalDeviceProperties2 p_vkGetPhysicalDeviceProperties2; + PFN_vkGetPhysicalDeviceProperties2KHR p_vkGetPhysicalDeviceProperties2KHR; PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR p_vkGetPhysicalDeviceSurfaceCapabilities2KHR; PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; PFN_vkGetPhysicalDeviceSurfaceFormats2KHR p_vkGetPhysicalDeviceSurfaceFormats2KHR; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9202
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 21 +++++++ dlls/win32u/vulkan.c | 49 +++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/winevulkan/Makefile.in | 2 +- dlls/winevulkan/loader.c | 116 ----------------------------------- 5 files changed, 72 insertions(+), 117 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 13b49a9f12c..5a15690eed9 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -7617,3 +7617,24 @@ BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid ) unlock_display_devices(); return found; } + +/* Find the Vulkan LUID corresponding to a device UUID */ +BOOL get_luid_from_vulkan_uuid( const GUID *uuid, LUID *luid, UINT32 *node_mask ) +{ + BOOL found = FALSE; + struct gpu *gpu; + + if (!lock_display_devices( FALSE )) return FALSE; + + LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) + { + if (!IsEqualGUID( uuid, &gpu->vulkan_uuid )) continue; + *luid = gpu->luid; + *node_mask = 1; + found = TRUE; + break; + } + + unlock_display_devices(); + return found; +} diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 45ed31606dd..cddd5feacec 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -1002,11 +1002,59 @@ static VkResult win32u_vkGetPhysicalDevicePresentRectanglesKHR( VkPhysicalDevice surface->obj.host.surface, rect_count, rects ); } +static void *find_vk_struct( void *s, VkStructureType t ) +{ + VkBaseOutStructure *header; + + for (header = s; header; header = header->pNext) + { + if (header->sType == t) return header; + } + + return NULL; +} + +static void fill_luid_property( VkPhysicalDeviceProperties2 *properties2 ) +{ + VkPhysicalDeviceVulkan11Properties *vk11; + VkPhysicalDeviceIDProperties *id; + VkBool32 device_luid_valid; + UINT32 node_mask = 0; + const GUID *uuid; + LUID luid; + + vk11 = find_vk_struct( properties2, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES ); + id = find_vk_struct( properties2, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES ); + + if (!vk11 && !id) return; + uuid = (const GUID *)(id ? id->deviceUUID : vk11->deviceUUID); + device_luid_valid = get_luid_from_vulkan_uuid( uuid, &luid, &node_mask ); + if (!device_luid_valid) WARN( "luid for %s not found\n", debugstr_guid(uuid) ); + + if (id) + { + if (device_luid_valid) memcpy( &id->deviceLUID, &luid, sizeof(id->deviceLUID) ); + id->deviceLUIDValid = device_luid_valid; + id->deviceNodeMask = node_mask; + } + + if (vk11) + { + if (device_luid_valid) memcpy( &vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID) ); + vk11->deviceLUIDValid = device_luid_valid; + vk11->deviceNodeMask = node_mask; + } + + TRACE( "deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x.\n", + properties2->properties.deviceName, device_luid_valid, luid.HighPart, luid.LowPart ); +} + static void win32u_vkGetPhysicalDeviceProperties2( VkPhysicalDevice client_physical_device, VkPhysicalDeviceProperties2 *properties2 ) { struct vulkan_physical_device *physical_device = vulkan_physical_device_from_handle( client_physical_device ); physical_device->instance->p_vkGetPhysicalDeviceProperties2( physical_device->host.physical_device, properties2 ); + fill_luid_property( properties2 ); } static void win32u_vkGetPhysicalDeviceProperties2KHR( VkPhysicalDevice client_physical_device, VkPhysicalDeviceProperties2 *properties2 ) @@ -1014,6 +1062,7 @@ static void win32u_vkGetPhysicalDeviceProperties2KHR( VkPhysicalDevice client_ph struct vulkan_physical_device *physical_device = vulkan_physical_device_from_handle( client_physical_device ); physical_device->instance->p_vkGetPhysicalDeviceProperties2KHR( physical_device->host.physical_device, properties2 ); + fill_luid_property( properties2 ); } static VkResult win32u_vkGetPhysicalDeviceSurfaceFormatsKHR( VkPhysicalDevice client_physical_device, VkSurfaceKHR client_surface, diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 99762011ba0..cce3af26c0e 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -204,6 +204,7 @@ struct vulkan_gpu extern BOOL get_vulkan_gpus( struct list *gpus ); extern void free_vulkan_gpu( struct vulkan_gpu *gpu ); extern BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid ); +extern BOOL get_luid_from_vulkan_uuid( const GUID *uuid, LUID *luid, UINT32 *node_mask ); extern int d3dkmt_object_get_fd( D3DKMT_HANDLE local ); diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index 52bffca2843..80aa536159b 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,7 +1,7 @@ MODULE = winevulkan.dll UNIXLIB = winevulkan.so IMPORTLIB = winevulkan -IMPORTS = user32 gdi32 advapi32 setupapi win32u +IMPORTS = advapi32 UNIX_LIBS = -lwin32u $(PTHREAD_LIBS) SOURCES = \ diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 79bbe8a2758..8238d476af1 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -20,10 +20,6 @@ #include <stdlib.h> #include "vulkan_loader.h" #include "winreg.h" -#include "ntuser.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); @@ -32,27 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 -DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); - static HINSTANCE hinstance; -static void *wine_vk_get_global_proc_addr(const char *name); - -#define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) -static void *wine_vk_find_struct_(void *s, VkStructureType t) -{ - VkBaseOutStructure *header; - - for (header = s; header; header = header->pNext) - { - if (header->sType == t) - return header; - } - - return NULL; -} - VkResult WINAPI vkEnumerateInstanceLayerProperties(uint32_t *count, VkLayerProperties *properties) { TRACE("%p, %p\n", count, properties); @@ -440,97 +417,6 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) return params.result; } -static HANDLE get_display_device_init_mutex(void) -{ - HANDLE mutex = CreateMutexW(NULL, FALSE, L"display_device_init"); - - WaitForSingleObject(mutex, INFINITE); - return mutex; -} - -static void release_display_device_init_mutex(HANDLE mutex) -{ - ReleaseMutex(mutex); - CloseHandle(mutex); -} - -/* Wait until graphics driver is loaded by explorer */ -static void wait_graphics_driver_ready(void) -{ - static BOOL ready = FALSE; - - if (!ready) - { - SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); - ready = TRUE; - } -} - -static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) -{ - VkPhysicalDeviceVulkan11Properties *vk11; - VkBool32 device_luid_valid = VK_FALSE; - VkPhysicalDeviceIDProperties *id; - uint32_t device_node_mask = 0; - SP_DEVINFO_DATA device_data; - const uint8_t* device_uuid; - DWORD type, device_idx = 0; - HDEVINFO devinfo; - HANDLE mutex; - GUID uuid; - LUID luid; - - vk11 = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES); - id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES); - - if (!vk11 && !id) - return; - - wait_graphics_driver_ready(); - mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, L"PCI", NULL, 0); - device_data.cbSize = sizeof(device_data); - while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, - &type, (BYTE *)&uuid, sizeof(uuid), NULL, 0)) - continue; - - device_uuid = id ? id->deviceUUID : vk11->deviceUUID; - - if (!IsEqualGUID(&uuid, device_uuid)) - continue; - - if (SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid, sizeof(luid), NULL, 0)) - { - device_luid_valid = VK_TRUE; - device_node_mask = 1; - break; - } - } - SetupDiDestroyDeviceInfoList(devinfo); - release_display_device_init_mutex(mutex); - - if (id) - { - if (device_luid_valid) memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); - id->deviceLUIDValid = device_luid_valid; - id->deviceNodeMask = device_node_mask; - } - - if (vk11) - { - if (device_luid_valid) memcpy(&vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID)); - vk11->deviceLUIDValid = device_luid_valid; - vk11->deviceNodeMask = device_node_mask; - } - - TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08lx:%08lx deviceNodeMask:%#x.\n", - properties2->properties.deviceName, device_luid_valid, luid.HighPart, luid.LowPart, - device_node_mask); -} - void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { @@ -543,7 +429,6 @@ void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, params.pProperties = properties2; status = UNIX_CALL(vkGetPhysicalDeviceProperties2, ¶ms); assert(!status); - fill_luid_property(properties2); } void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, @@ -558,7 +443,6 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, params.pProperties = properties2; status = UNIX_CALL(vkGetPhysicalDeviceProperties2KHR, ¶ms); assert(!status); - fill_luid_property(properties2); } VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9202
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 28 ---------------------------- dlls/winevulkan/loader_thunks.c | 20 ++++++++++++++++++++ dlls/winevulkan/make_vulkan | 2 -- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 8238d476af1..77bed3603af 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -417,34 +417,6 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) return params.result; } -void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, - VkPhysicalDeviceProperties2 *properties2) -{ - struct vkGetPhysicalDeviceProperties2_params params; - NTSTATUS status; - - TRACE("%p, %p\n", phys_dev, properties2); - - params.physicalDevice = phys_dev; - params.pProperties = properties2; - status = UNIX_CALL(vkGetPhysicalDeviceProperties2, ¶ms); - assert(!status); -} - -void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, - VkPhysicalDeviceProperties2 *properties2) -{ - struct vkGetPhysicalDeviceProperties2KHR_params params; - NTSTATUS status; - - TRACE("%p, %p\n", phys_dev, properties2); - - params.physicalDevice = phys_dev; - params.pProperties = properties2; - status = UNIX_CALL(vkGetPhysicalDeviceProperties2KHR, ¶ms); - assert(!status); -} - VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkDevice *ret) { diff --git a/dlls/winevulkan/loader_thunks.c b/dlls/winevulkan/loader_thunks.c index 12ed1a87846..2b396998be8 100644 --- a/dlls/winevulkan/loader_thunks.c +++ b/dlls/winevulkan/loader_thunks.c @@ -5662,6 +5662,26 @@ void WINAPI vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, VkPhy assert(!status && "vkGetPhysicalDeviceProperties"); } +void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) +{ + struct vkGetPhysicalDeviceProperties2_params params; + NTSTATUS status; + params.physicalDevice = physicalDevice; + params.pProperties = pProperties; + status = UNIX_CALL(vkGetPhysicalDeviceProperties2, ¶ms); + assert(!status && "vkGetPhysicalDeviceProperties2"); +} + +void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) +{ + struct vkGetPhysicalDeviceProperties2KHR_params params; + NTSTATUS status; + params.physicalDevice = physicalDevice; + params.pProperties = pProperties; + status = UNIX_CALL(vkGetPhysicalDeviceProperties2KHR, ¶ms); + assert(!status && "vkGetPhysicalDeviceProperties2KHR"); +} + void WINAPI vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *pQueueFamilyDataGraphProcessingEngineInfo, VkQueueFamilyDataGraphProcessingEnginePropertiesARM *pQueueFamilyDataGraphProcessingEngineProperties) { struct vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM_params params; diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 12da96e2c37..619dd35cd72 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -301,8 +301,6 @@ MANUAL_LOADER_THUNKS = { "vkEnumerateInstanceExtensionProperties", "vkEnumerateInstanceVersion", "vkFreeCommandBuffers", - "vkGetPhysicalDeviceProperties2", - "vkGetPhysicalDeviceProperties2KHR", } STRUCT_CHAIN_CONVERSIONS = { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9202
v2: Better node mask handling in error cases. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9202#note_118894
participants (2)
-
Jacek Caban -
Jacek Caban (＠jacek)