From 3b686f3a2fe42a286ffe1b82974ea9b24ff049a7 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 8 Feb 2023 14:27:04 -0600 Subject: [PATCH] vulkan: Remove unused fields from Extension and ApiVersion These are a left-over from when these classes were used by ANV to define extension enables in python. They haven't been used since we added extension table structs and move extension enables to C. Acked-By: Mike Blumenkrantz Part-of: --- src/vulkan/util/vk_entrypoints.py | 2 +- src/vulkan/util/vk_extensions.py | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/vulkan/util/vk_entrypoints.py b/src/vulkan/util/vk_entrypoints.py index b0aafb65f2c..8bd0e4767cd 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) + ext = Extension(ext_name, 1) 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 b00daea4bf7..c57d6442b77 100644 --- a/src/vulkan/util/vk_extensions.py +++ b/src/vulkan/util/vk_extensions.py @@ -2,18 +2,10 @@ import copy import re import xml.etree.ElementTree as et -def _bool_to_c_expr(b): - if b is True: - return 'true' - if b is False: - return 'false' - return b - class Extension: - def __init__(self, name, ext_version, enable): + def __init__(self, name, ext_version): self.name = name self.ext_version = int(ext_version) - self.enable = _bool_to_c_expr(enable) def c_android_condition(self): # if it's an EXT or vendor extension, it's allowed @@ -27,9 +19,8 @@ class Extension: return 'ANDROID_API_LEVEL >= %d' % (allowed_version) class ApiVersion: - def __init__(self, version, enable): + def __init__(self, version): self.version = version - self.enable = _bool_to_c_expr(enable) class VkVersion: def __init__(self, string): @@ -105,7 +96,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)) + extensions.append(Extension(name, version)) return sorted(extensions, key=extension_order)