[PATCH 2/3] winevulkan: Move needs_unwrapping implementation to VkVariable.

[Jacek Caban]

From: Jacek Caban

---
 dlls/winevulkan/make_vulkan | 40 +++++++++++++------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 967446794e7..5d4888e3006 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -1193,6 +1193,20 @@ class VkVariable(object):
             return not self.handle.is_dispatchable()
         return False

+    def needs_unwrapping(self):
+        """ Returns if variable needs unwrapping of handle. """
+
+        if self.is_struct():
+            return self.struct.needs_unwrapping()
+
+        if self.is_handle():
+            return self.handle.needs_unwrapping()
+
+        if self.is_generic_handle():
+            return True
+
+        return False
+
     def needs_alloc(self, conv, unwrap):
         """ Returns True if conversion needs allocation """
         if self.is_dynamic_array():
@@ -1415,20 +1429,6 @@ class VkMember(VkVariable):
     def is_bit_field(self):
         return self.bit_width is not None

-    def needs_unwrapping(self):
-        """ Structures with wrapped handles need unwrapping. """
-
-        if self.is_struct():
-            return self.struct.needs_unwrapping()
-
-        if self.is_handle():
-            return self.handle.is_wrapped()
-
-        if self.is_generic_handle():
-            return True
-
-        return False
-
     def needs_conversion(self, conv, unwrap, direction, struct_const):
         """ Check if member needs conversion. """

@@ -1668,18 +1668,6 @@ class VkParam(VkVariable):
             return True
         return False

-    def needs_unwrapping(self):
-        """ Returns if parameter needs unwrapping of handle. """
-
-        # Wrapped handle parameters are handled separately, only look for wrapped handles in structs
-        if self.is_struct():
-            return self.struct.needs_unwrapping()
-
-        if self.is_handle() and self.is_dynamic_array():
-            return self.handle.needs_unwrapping()
-
-        return False
-
     def spec(self):
         """ Generate spec file entry for this parameter. """