[PATCH] winevulkan: Don't process struct alias' in pNext conversion chains.

[Derek Lesho]

Fixes parsing of Vulkan 1.1.106+

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com>
---
 dlls/winevulkan/make_vulkan | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 4f1c03cc7c..8e043538c8 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -2955,9 +2955,10 @@ class VkRegistry(object):
         for struct in structs:
             struct.set_type_info(self.types)
 
-            for structextend in struct.structextends:
-                s = self.types[structextend]["data"]
-                s.struct_extensions.append(struct)
+            if struct.alias is None:
+                for structextend in struct.structextends:
+                    s = self.types[structextend]["data"]
+                    s.struct_extensions.append(struct)
 
         # Guarantee everything is sorted, so code generation doesn't have
         # to deal with this.
-- 
2.23.0

[Liam Middlebrook]

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com>


Thanks,

Liam Middlebrook

On 10/30/19 12:15 PM, Derek Lesho wrote:
> Fixes parsing of Vulkan 1.1.106+
>
> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com>
> ---
>   dlls/winevulkan/make_vulkan | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
> index 4f1c03cc7c..8e043538c8 100755
> --- a/dlls/winevulkan/make_vulkan
> +++ b/dlls/winevulkan/make_vulkan
> @@ -2955,9 +2955,10 @@ class VkRegistry(object):
>           for struct in structs:
>               struct.set_type_info(self.types)
>
> -            for structextend in struct.structextends:
> -                s = self.types[structextend]["data"]
> -                s.struct_extensions.append(struct)
> +            if struct.alias is None:
> +                for structextend in struct.structextends:
> +                    s = self.types[structextend]["data"]
> +                    s.struct_extensions.append(struct)
>
> # Guarantee everything is sorted, so code generation doesn't have
>           # to deal with this.

-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information.  Any unauthorized review, use, disclosure or distribution
is prohibited.  If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------