From 789fc6257427b63bdb5af9afd60d537fa8444401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Sat, 24 Mar 2018 14:28:00 +0100 Subject: [PATCH] winevulkan: Generate conversions only for autogenerated thunks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Roderick Colenbrander Signed-off-by: Alexandre Julliard --- dlls/winevulkan/make_vulkan | 5 ++--- dlls/winevulkan/vulkan_thunks.c | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5303fec7cf8..14a61b9c3cd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1710,9 +1710,8 @@ class VkGenerator(object): conversions = func.get_conversions() for conv in conversions: - # Pull in any conversions for vulkan_thunks.c. Driver conversions we - # handle manually in vulkan.c if needed. - if not func.is_driver_func(): + # Pull in any conversions for vulkan_thunks.c. + if func.needs_thunk(): # Append if we don't already have this conversion. if not any(c == conv for c in self.conversions): self.conversions.append(conv) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index bf8e78c5fb0..463a04a78f2 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -12,17 +12,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkCommandBufferAllocateInfo_win_to_host(const VkCommandBufferAllocateInfo *in, VkCommandBufferAllocateInfo_host *out) -{ - if (!in) return; - - out->sType = in->sType; - out->pNext = in->pNext; - out->commandPool = in->commandPool; - out->level = in->level; - out->commandBufferCount = in->commandBufferCount; -} - static inline void convert_VkDescriptorSetAllocateInfo_win_to_host(const VkDescriptorSetAllocateInfo *in, VkDescriptorSetAllocateInfo_host *out) { if (!in) return;