Module: wine Branch: master Commit: 789fc6257427b63bdb5af9afd60d537fa8444401 URL: https://source.winehq.org/git/wine.git/?a=commit;h=789fc6257427b63bdb5af9afd...
Author: Józef Kucia jkucia@codeweavers.com Date: Sat Mar 24 14:28:00 2018 +0100
winevulkan: Generate conversions only for autogenerated thunks.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Roderick Colenbrander thunderbird2k@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 5303fec..14a61b9 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 bf8e78c..463a04a 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;