From 22bc2a897c0f1dfea4c9b90c2251a5d0a6eee2a0 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 31 Jan 2024 17:21:43 +0000 Subject: [PATCH] vk/util: fix 'beta' check for physical device properties `--beta` is a string, not a bool (although really it should be, but that's a bigger change). Fixes: 083793a39dd9fb421bb8 ("vulkan: Allow beta extensions for physical device properties") Part-of: (cherry picked from commit c35247ab2046bf3e013c51a0db19b7636854adbf) --- .pick_status.json | 2 +- src/vulkan/util/vk_physical_device_properties_gen.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8c443186065..588d8497f7e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2294,7 +2294,7 @@ "description": "vk/util: fix 'beta' check for physical device properties", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "083793a39dd9fb421bb8ae78908b18ae6cb8a178", "notes": null diff --git a/src/vulkan/util/vk_physical_device_properties_gen.py b/src/vulkan/util/vk_physical_device_properties_gen.py index 4b74047618c..11cde09c384 100644 --- a/src/vulkan/util/vk_physical_device_properties_gen.py +++ b/src/vulkan/util/vk_physical_device_properties_gen.py @@ -223,7 +223,7 @@ def get_property_structs(doc, api, beta): # Skip extensions with a define for now guard = required[full_name].guard - if guard is not None and (guard != "VK_ENABLE_BETA_EXTENSIONS" or not beta): + if guard is not None and (guard != "VK_ENABLE_BETA_EXTENSIONS" or beta != "true"): continue # find Vulkan structure type