From: William Horvath william@horvath.blog
When generating conversion functions, we were creating unnecessary input conversions for unions that are members of returnedonly structs. These conversions are never used since the parent struct is only used for output.
This prevents creating the vestigial "convert_VkPerformanceValueDataINTEL_win32_to_host" converter, which clang complains about with -Wunused-function set.
No functional change intended. --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 72a8d548b5d..6fd7debb5c3 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1402,7 +1402,7 @@ class VkVariable(object): conversions.extend(struct.get_conversions(unwrap, is_const))
for conv in [False, True]: - if struct.needs_conversion(conv, unwrap, Direction.INPUT, is_const): + if not (self.is_union() and self.returnedonly) and struct.needs_conversion(conv, unwrap, Direction.INPUT, is_const): conversions.append(StructConversionFunction(struct, Direction.INPUT, conv, unwrap, is_const)) if struct.needs_conversion(conv, unwrap, Direction.OUTPUT, is_const): conversions.append(StructConversionFunction(struct, Direction.OUTPUT, conv, unwrap, is_const)) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 98b0abda785..7659281c960 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -26084,22 +26084,6 @@ static inline void convert_VkMicromapBuildSizesInfoEXT_host_to_win32(const VkMic out->discardable = in->discardable; }
-static inline void convert_VkPerformanceValueDataINTEL_win32_to_host(const VkPerformanceValueDataINTEL32 *in, VkPerformanceValueDataINTEL *out, VkFlags selector) -{ - if (!in) return; - - if (selector == VK_PERFORMANCE_VALUE_TYPE_UINT32_INTEL) - out->value32 = in->value32; - if (selector == VK_PERFORMANCE_VALUE_TYPE_UINT64_INTEL) - out->value64 = in->value64; - if (selector == VK_PERFORMANCE_VALUE_TYPE_FLOAT_INTEL) - out->valueFloat = in->valueFloat; - if (selector == VK_PERFORMANCE_VALUE_TYPE_BOOL_INTEL) - out->valueBool = in->valueBool; - if (selector == VK_PERFORMANCE_VALUE_TYPE_STRING_INTEL) - out->valueString = UlongToPtr(in->valueString); -} - static inline void convert_VkPerformanceValueDataINTEL_host_to_win32(const VkPerformanceValueDataINTEL *in, VkPerformanceValueDataINTEL32 *out, VkFlags selector) { if (!in) return;