Jacek Caban : winevulkan: Drop "static_array" from conversion function names.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0bfad6584ff5389115904a68cb77cb09ec802c0f
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0bfad6584ff5389115904a68cb77cb0...

Author: Jacek Caban 
Date:   Thu Nov  3 20:20:22 2022 +0100

winevulkan: Drop "static_array" from conversion function names.

Static arrays need only output conversion and output conversion is the same for static and dynamic arrays.

---

dlls/winevulkan/make_vulkan     | 6 ++----
 dlls/winevulkan/vulkan_thunks.c | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 0125831dc84..5949cea9543 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -1323,7 +1323,7 @@ class VkMember(VkVariable):
                 count = self.array_len
                 if direction == Direction.OUTPUT:
                     # Needed by VkMemoryHeap.memoryHeaps
-                    return "convert_{0}_static_array_host_to_{5}({2}{1}, {3}{1}, {4});\n".format(self.type, self.name, input, output, count, win_type)
+                    return "convert_{0}_array_host_to_{5}({2}{1}, {3}{1}, {4});\n".format(self.type, self.name, input, output, count, win_type)
                 else:
                     # Nothing needed this yet.
                     LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name))
@@ -2148,9 +2148,7 @@ class ConversionFunction(object):

def _set_name(self):
         name = "convert_{0}_".format(self.type)
-        if self.array:
-            name += "static_array_"
-        elif self.dyn_array:
+        if self.array or self.dyn_array:
             name += "array_"

win_type = "win32" if self.conv else "win64"
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index 18039ca3c6f..cd00aa0b6fb 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -2024,7 +2024,7 @@ static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageF
 #endif /* USE_STRUCT_CONVERSION */

#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryHeap_static_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap *out, uint32_t count)
+static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap *out, uint32_t count)
 {
     unsigned int i;

@@ -2046,7 +2046,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const
     out->memoryTypeCount = in->memoryTypeCount;
     memcpy(out->memoryTypes, in->memoryTypes, VK_MAX_MEMORY_TYPES * sizeof(VkMemoryType));
     out->memoryHeapCount = in->memoryHeapCount;
-    convert_VkMemoryHeap_static_array_host_to_win32(in->memoryHeaps, out->memoryHeaps, VK_MAX_MEMORY_HEAPS);
+    convert_VkMemoryHeap_array_host_to_win32(in->memoryHeaps, out->memoryHeaps, VK_MAX_MEMORY_HEAPS);
 }
 #endif /* USE_STRUCT_CONVERSION */