diff options
| -rw-r--r-- | src/vulkan/util/gen_enum_to_str.py | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/vulkan/util/gen_enum_to_str.py b/src/vulkan/util/gen_enum_to_str.py index 5357278ded1..0983c4e50a5 100644 --- a/src/vulkan/util/gen_enum_to_str.py +++ b/src/vulkan/util/gen_enum_to_str.py @@ -71,23 +71,16 @@ C_TEMPLATE = Template(textwrap.dedent(u"""\ const char * vk_${enum.name[2:]}_to_str(${enum.name} input) { + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wswitch" switch(input) { % for v in sorted(enum.values.keys()): - % if enum.values[v] in FOREIGN_ENUM_VALUES: - - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wswitch" - % endif case ${v}: return "${enum.values[v]}"; - % if enum.values[v] in FOREIGN_ENUM_VALUES: - #pragma GCC diagnostic pop - - % endif % endfor - default: - unreachable("Undefined enum value."); } + #pragma GCC diagnostic pop + unreachable("Undefined enum value."); } % if enum.guard: @@ -225,12 +218,6 @@ H_TEMPLATE = Template(textwrap.dedent(u"""\ #endif"""), output_encoding='utf-8') -# These enums are defined outside their respective enum blocks, and thus cause -# -Wswitch warnings. -FOREIGN_ENUM_VALUES = [ - "VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID", -] - class NamedFactory(object): """Factory for creating enums.""" @@ -433,8 +420,7 @@ def main(): enums=enums, extensions=extensions, structs=structs, - copyright=COPYRIGHT, - FOREIGN_ENUM_VALUES=FOREIGN_ENUM_VALUES)) + copyright=COPYRIGHT)) if __name__ == '__main__': |