[PATCH 1/3] winevulkan: Support struct forward-declarations as base types.

[Philip Rebohle]

Some types are basically forward-declared structs now, such
as ANativeWindow.

Signed-off-by: Philip Rebohle 
---
 dlls/winevulkan/make_vulkan | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 5d9889620ed..e24dac99011 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -253,7 +253,10 @@ class VkBaseType(object):
     def definition(self):
         # Definition is similar for alias or non-alias as type
         # is already set to alias.
-        return "typedef {0} {1};\n".format(self.type, self.name)
+        if not self.type is None:
+            return "typedef {0} {1};\n".format(self.type, self.name)
+        else:
+            return "struct {0};\n".format(self.name)

def is_alias(self):
         return bool(self.alias)
@@ -2953,7 +2956,9 @@ class VkRegistry(object):

if type_info["category"] == "basetype":
                 name = t.find("name").text
-                _type = t.find("type").text
+                _type = None
+                if not t.find("type") is None:
+                    _type = t.find("type").text
                 basetype = VkBaseType(name, _type)
                 base_types.append(basetype)
                 type_info["data"] = basetype

[PATCH 2/3] winevulkan: Avoid adding duplicate enum aliases.

[Philip Rebohle]

VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR is being
defined multiple times by the current vk.xml.

Signed-off-by: Philip Rebohle 
---
 dlls/winevulkan/make_vulkan | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index e24dac99011..36181e101fc 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -395,7 +395,9 @@ class VkEnum(object):
             if not value.is_alias() and v.value == value.value:
                 LOGGER.debug("Adding duplicate enum value {0} to {1}".format(v, self.name))
                 return
-        self.values.append(value)
+	# Avoid adding duplicate aliases multiple times
+        if not any(x.name == value.name for x in self.values):
+            self.values.append(value)

def definition(self):
         if self.is_alias():

[PATCH 2/3] winevulkan: Avoid adding duplicate enum aliases.

[Liam Middlebrook]

On 5/4/20 11:29 AM, Philip Rebohle wrote:
> VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR is being
> defined multiple times by the current vk.xml.
> Signed-off-by: Philip Rebohle
>
> dlls/winevulkan/make_vulkan | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
> index e24dac99011..36181e101fc 100755
> --- a/dlls/winevulkan/make_vulkan
> +++ b/dlls/winevulkan/make_vulkan
> @@ -395,7 +395,9 @@ class VkEnum(object):
>               if not value.is_alias() and v.value == value.value:
>                   LOGGER.debug("Adding duplicate enum value {0} to {1}".format(v, self.name))
>                   return
> -
>    self.values.append(value)

Nitpick: I think this should be aligned with the if statement below it

Thanks,

Liam Middlebrook
> -
>
> # Avoid adding duplicate aliases multiple times
> -
>    if not any(x.name == value.name for x in self.values):
> -
>        self.values.append(value)
>
> def definition(self):
>     if self.is_alias():

-----------------------------------------------------------------------------------
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.
-----------------------------------------------------------------------------------

[PATCH 2/3] winevulkan: Avoid adding duplicate enum aliases.

[Philip Rebohle]

You mean the comment? I didn't see that, looks like my editor randomly 
decided to use an incorrect indentation mode.

Am 04.05.20 um 21:26 schrieb Liam Middlebrook:
> On 5/4/20 11:29 AM, Philip Rebohle wrote:
> > VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR is being
> > defined multiple times by the current vk.xml.
> > Signed-off-by: Philip Rebohle
> >
> > dlls/winevulkan/make_vulkan | 4 +++-
> >   1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
> > index e24dac99011..36181e101fc 100755
> > --- a/dlls/winevulkan/make_vulkan
> > +++ b/dlls/winevulkan/make_vulkan
> > @@ -395,7 +395,9 @@ class VkEnum(object):
> >               if not value.is_alias() and v.value == value.value:
> >                   LOGGER.debug("Adding duplicate enum value {0} to 
> > {1}".format(v, self.name))
> >                   return
> > -        self.values.append(value)
>
> Nitpick: I think this should be aligned with the if statement below it
>
> Thanks,
>
> Liam Middlebrook
> > +    # Avoid adding duplicate aliases multiple times
> > +        if not any(x.name == value.name for x in self.values):
> > +            self.values.append(value)
> >       def definition(self):
> >           if self.is_alias():
>
> 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.

[PATCH 2/3] winevulkan: Avoid adding duplicate enum aliases.

[Liam Middlebrook]

Yes the comment (sorry I posted it above-inline rather than 
below-inline), once that's fixed up I'll signoff on patches 2 & 3.

Thanks,

Liam Middlebrook

On 5/4/20 12:32 PM, Philip Rebohle wrote:
> You mean the comment? I didn't see that, looks like my editor randomly 
> decided to use an incorrect indentation mode.
>
> Am 04.05.20 um 21:26 schrieb Liam Middlebrook:
> > On 5/4/20 11:29 AM, Philip Rebohle wrote:
> > > VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR is being
> > > defined multiple times by the current vk.xml.
> > > Signed-off-by: Philip Rebohle
> > >
> > > dlls/winevulkan/make_vulkan | 4 +++-
> > >   1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
> > > index e24dac99011..36181e101fc 100755
> > > --- a/dlls/winevulkan/make_vulkan
> > > +++ b/dlls/winevulkan/make_vulkan
> > > @@ -395,7 +395,9 @@ class VkEnum(object):
> > >               if not value.is_alias() and v.value == value.value:
> > >                   LOGGER.debug("Adding duplicate enum value {0} to 
> > > {1}".format(v, self.name))
> > >                   return
> > > -        self.values.append(value)
> >
> > Nitpick: I think this should be aligned with the if statement below it
> >
> > Thanks,
> >
> > Liam Middlebrook
> > > +    # Avoid adding duplicate aliases multiple times
> > > +        if not any(x.name == value.name for x in self.values):
> > > +            self.values.append(value)
> > >       def definition(self):
> > >           if self.is_alias():
> >
> > 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.

[PATCH v2 2/3] winevulkan: Avoid adding duplicate enum aliases.

[Philip Rebohle]

VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR is being
defined multiple times by the current vk.xml.

Signed-off-by: Philip Rebohle 
---
v2: Fix indentation.

dlls/winevulkan/make_vulkan | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index e24dac99011..ccc3f228b0f 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -395,7 +395,9 @@ class VkEnum(object):
             if not value.is_alias() and v.value == value.value:
                 LOGGER.debug("Adding duplicate enum value {0} to {1}".format(v, self.name))
                 return
-        self.values.append(value)
+        # Avoid adding duplicate aliases multiple times
+        if not any(x.name == value.name for x in self.values):
+            self.values.append(value)

def definition(self):
         if self.is_alias():

[PATCH v2 2/3] winevulkan: Avoid adding duplicate enum aliases.

[Liam Middlebrook]

Signed-off-by: Liam Middlebrook

On 5/4/20 1:12 PM, Philip Rebohle wrote:
> VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR is being
> defined multiple times by the current vk.xml.
> Signed-off-by: Philip Rebohle
>
> v2: Fix indentation.
>
> dlls/winevulkan/make_vulkan | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
> index e24dac99011..ccc3f228b0f 100755
> --- a/dlls/winevulkan/make_vulkan
> +++ b/dlls/winevulkan/make_vulkan
> @@ -395,7 +395,9 @@ class VkEnum(object):
>               if not value.is_alias() and v.value == value.value:
>                   LOGGER.debug("Adding duplicate enum value {0} to {1}".format(v, self.name))
>                   return
> -
>    self.values.append(value)
> -
>    # Avoid adding duplicate aliases multiple times
> -
>    if not any(x.name == value.name for x in self.values):
> -
>        self.values.append(value)
>
> def definition(self):
>     if self.is_alias():

-----------------------------------------------------------------------------------
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.
-----------------------------------------------------------------------------------

[PATCH 3/3] winevulkan: Update to VK spec version spec 1.2.140.

[Philip Rebohle]

Signed-off-by: Philip Rebohle 
---
 dlls/winevulkan/make_vulkan | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 36181e101fc..60301fc1f1a 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -64,7 +64,7 @@ from enum import Enum
 LOGGER = logging.Logger("vulkan")
 LOGGER.addHandler(logging.StreamHandler())

-VK_XML_VERSION = "1.2.139"
+VK_XML_VERSION = "1.2.140"
 WINE_VK_VERSION = (1, 2)

# Filenames to create.

[PATCH 3/3] winevulkan: Update to VK spec version spec 1.2.140.

[Liam Middlebrook]

Signed-off-by: Liam Middlebrook

On 5/4/20 11:30 AM, Philip Rebohle wrote:
> Signed-off-by: Philip Rebohle
>
> dlls/winevulkan/make_vulkan | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
> index 36181e101fc..60301fc1f1a 100755
> --- a/dlls/winevulkan/make_vulkan
> +++ b/dlls/winevulkan/make_vulkan
> @@ -64,7 +64,7 @@ from enum import Enum
>   LOGGER = logging.Logger("vulkan")
>   LOGGER.addHandler(logging.StreamHandler())
>
> -VK_XML_VERSION = "1.2.139"
> +VK_XML_VERSION = "1.2.140"
>   WINE_VK_VERSION = (1, 2)
>
> # Filenames to create.

-----------------------------------------------------------------------------------
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.
-----------------------------------------------------------------------------------

[Liam Middlebrook]

Signed-off-by: Liam Middlebrook

On 5/4/20 11:29 AM, Philip Rebohle wrote:
> Some types are basically forward-declared structs now, such
> as ANativeWindow.
> Signed-off-by: Philip Rebohle
>
> dlls/winevulkan/make_vulkan | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
> index 5d9889620ed..e24dac99011 100755
> --- a/dlls/winevulkan/make_vulkan
> +++ b/dlls/winevulkan/make_vulkan
> @@ -253,7 +253,10 @@ class VkBaseType(object):
>       def definition(self):
>           # Definition is similar for alias or non-alias as type
>           # is already set to alias.
> -
>    return "typedef {0} {1};\n".format(self.type, self.name)
> -
>    if not self.type is None:
> -
>        return "typedef {0} {1};\n".format(self.type, self.name)
> -
>    else:
> -
>        return "struct {0};\n".format(self.name)
>
> def is_alias(self):
>     return bool(self.alias)
>
> @@ -2953,7 +2956,9 @@ class VkRegistry(object):
>           if type_info["category"] == "basetype":
>               name = t.find("name").text
> -
>            _type = t.find("type").text
> -
>            _type = None
> -
>            if not t.find("type") is None:
> -
>                _type = t.find("type").text
>             basetype = VkBaseType(name, _type)
>             base_types.append(basetype)
>             type_info["data"] = basetype

-----------------------------------------------------------------------------------
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.
-----------------------------------------------------------------------------------