From 8c6de60c54d1d9ab829aebefe9e9d348e93f9fc0 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 features `--beta` is a string, not a bool (although really it should be, but that's a bigger change). Fixes: a7141a6f8a1112575c73 ("vulkan: Allow beta extensions for physical device features") Part-of: (cherry picked from commit 794ec7f0a1c208143cbe4e9aa5a09b3d811824b3) --- .pick_status.json | 2 +- src/vulkan/util/vk_physical_device_features_gen.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 05868ecd540..8c443186065 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2304,7 +2304,7 @@ "description": "vk/util: fix 'beta' check for physical device features", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a7141a6f8a1112575c73281428fda0f8a798c857", "notes": null diff --git a/src/vulkan/util/vk_physical_device_features_gen.py b/src/vulkan/util/vk_physical_device_features_gen.py index f0d15fc3c16..27673ca3c0c 100644 --- a/src/vulkan/util/vk_physical_device_features_gen.py +++ b/src/vulkan/util/vk_physical_device_features_gen.py @@ -367,7 +367,7 @@ def get_feature_structs(doc, api, beta): # Skip extensions with a define for now guard = required[_type.attrib['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