From a47c903e51b2d8824566de24d5927317625bd136 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 16 Feb 2023 13:44:35 -0600 Subject: [PATCH] Revert "vk/util: keep track of extension requirements" This reverts commit ca98e4446b690709ce517b33d17cb3e2af3f5084. The way extension requirements are specified is about to change significantly. Since this is so new, it's easier to just revert for now. Part-of: --- src/vulkan/util/vk_entrypoints.py | 2 +- src/vulkan/util/vk_extensions.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vulkan/util/vk_entrypoints.py b/src/vulkan/util/vk_entrypoints.py index 176ac3113a8..b0aafb65f2c 100644 --- a/src/vulkan/util/vk_entrypoints.py +++ b/src/vulkan/util/vk_entrypoints.py @@ -135,7 +135,7 @@ def get_entrypoints(doc, entrypoints_to_defines): ext_name = extension.attrib['name'] - ext = Extension(ext_name, 1, True, None) + ext = Extension(ext_name, 1, True) ext.type = extension.attrib['type'] for command in extension.findall('./require/command'): diff --git a/src/vulkan/util/vk_extensions.py b/src/vulkan/util/vk_extensions.py index 093147909fe..b00daea4bf7 100644 --- a/src/vulkan/util/vk_extensions.py +++ b/src/vulkan/util/vk_extensions.py @@ -10,11 +10,10 @@ def _bool_to_c_expr(b): return b class Extension: - def __init__(self, name, ext_version, enable, requires): + def __init__(self, name, ext_version, enable): self.name = name self.ext_version = int(ext_version) self.enable = _bool_to_c_expr(enable) - self.requires = requires.split(',') if requires else [] def c_android_condition(self): # if it's an EXT or vendor extension, it's allowed @@ -99,7 +98,6 @@ def get_all_exts_from_xml(xml): name = ext_elem.attrib['name'] if not supported and name != 'VK_ANDROID_native_buffer': continue - requires = ext_elem.attrib.get('requires') version = None for enum_elem in ext_elem.findall('.require/enum'): if enum_elem.attrib['name'].endswith('_SPEC_VERSION'): @@ -107,7 +105,7 @@ def get_all_exts_from_xml(xml): if 'value' in enum_elem.attrib: assert version is None version = int(enum_elem.attrib['value']) - extensions.append(Extension(name, version, True, requires)) + extensions.append(Extension(name, version, True)) return sorted(extensions, key=extension_order) @@ -132,7 +130,6 @@ def init_exts_from_xml(xml, extensions, platform_defines): ext = ext_name_map[ext_name] ext.type = ext_elem.attrib['type'] - ext.requires = [ext_name_map[req] for req in ext.requires] # Mapping between extension name and the android version in which the extension # was whitelisted in Android CTS's dEQP-VK.info.device_extensions and