Philip Rebohle : winevulkan: Avoid adding duplicate enum aliases.

Alexandre Julliard julliard at winehq.org
Tue May 5 14:48:51 CDT 2020


Module: wine
Branch: master
Commit: 4465ecfe0e3fa9fa14518abd1907193adb154957
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4465ecfe0e3fa9fa14518abd1907193adb154957

Author: Philip Rebohle <philip.rebohle at tu-dortmund.de>
Date:   Mon May  4 22:12:10 2020 +0200

winevulkan: Avoid adding duplicate enum aliases.

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

Signed-off-by: Philip Rebohle <philip.rebohle at tu-dortmund.de>
Signed-off-by: Liam Middlebrook <lmiddlebrook at nvidia.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 e24dac9901..ccc3f228b0 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():




More information about the wine-cvs mailing list