From: Rémi Bernon <rbernon(a)codeweavers.com> Fixes: 4812732aa467f943c4fc4be8ed213a3ec2860c61 --- dlls/winevulkan/make_vulkan | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3fcaecfb616..c9afc3b939e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2957,20 +2957,16 @@ class VkGenerator(object): f.write("#define ALL_VK_CLIENT_DEVICE_EXTS") for ext in self.registry.extensions: - if ext["type"] != "device": - continue - if ext["name"] in UNEXPOSED_EXTENSIONS: - continue - f.write(f" \\\n USE_VK_EXT({ext["name"]})") + type, name = ext["type"], ext["name"] + if type == "device" and name not in UNEXPOSED_EXTENSIONS: + f.write(f" \\\n USE_VK_EXT({name})") f.write("\n\n") f.write("#define ALL_VK_DEVICE_EXTS ALL_VK_CLIENT_DEVICE_EXTS") for ext in self.registry.extensions: - if ext["type"] != "device": - continue - if ext["name"] not in UNEXPOSED_EXTENSIONS: - continue - f.write(f" \\\n USE_VK_EXT({ext["name"]})") + type, name = ext["type"], ext["name"] + if type == "device" and name in UNEXPOSED_EXTENSIONS: + f.write(f" \\\n USE_VK_EXT({name})") f.write("\n\n") f.write("#define ALL_VK_INSTANCE_FUNCS") @@ -2984,20 +2980,16 @@ class VkGenerator(object): f.write("#define ALL_VK_CLIENT_INSTANCE_EXTS") for ext in self.registry.extensions: - if ext["type"] != "instance": - continue - if ext["name"] in UNEXPOSED_EXTENSIONS: - continue - f.write(f" \\\n USE_VK_EXT({ext["name"]})") + type, name = ext["type"], ext["name"] + if type == "instance" and name not in UNEXPOSED_EXTENSIONS: + f.write(f" \\\n USE_VK_EXT({name})") f.write("\n\n") f.write("#define ALL_VK_INSTANCE_EXTS ALL_VK_CLIENT_INSTANCE_EXTS") for ext in self.registry.extensions: - if ext["type"] != "instance": - continue - if ext["name"] not in UNEXPOSED_EXTENSIONS: - continue - f.write(f" \\\n USE_VK_EXT({ext["name"]})") + type, name = ext["type"], ext["name"] + if type == "instance" and name in UNEXPOSED_EXTENSIONS: + f.write(f" \\\n USE_VK_EXT({name})") f.write("\n\n") f.write("#endif /* __WINE_VULKAN_H */\n") -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9471