[PATCH 3/3] winevulkan: Use generated PE thunks for vkGetPhysicalDeviceProperties2[KHR].

[Jacek Caban]

From: Jacek Caban

---
 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, &params);
-    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, &params);
-    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, &params);
+    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, &params);
+    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 = {