From 53231a96c0a69f03fd8a4d8770662df570ef9504 Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Thu, 10 Jun 2021 16:19:21 -0600 Subject: vulkaninfo: Improve formatting of surface caps VkSurfaceCapabilities has the width & height way out to the right while the rest of the structure doesn't. This makes it look inconsistent. This PR also changes the layout of the flag and flagbit printers to return earlier if possible. Change-Id: I1b478838b3c95e33354d3daf13040e891454324e --- scripts/vulkaninfo_generator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/vulkaninfo_generator.py') diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py index 7f1e1361..dfa2e0e7 100644 --- a/scripts/vulkaninfo_generator.py +++ b/scripts/vulkaninfo_generator.py @@ -441,7 +441,7 @@ def PrintGetFlagStrings(name, bitmask): "GetStrings(" + name + " value) {\n" out += " std::vector strings;\n" - out += " if (value == 0) strings.push_back(\"None\");\n" + out += " if (value == 0) { strings.push_back(\"None\"); return strings; }\n" for v in bitmask.options: val = v.value if isinstance(v.value, str) else str(hex(v.value)) out += " if (" + val + " & value) strings.push_back(\"" + \ @@ -454,13 +454,13 @@ def PrintFlags(bitmask, name): out = "void Dump" + name + \ "(Printer &p, std::string name, " + name + " value, int width = 0) {\n" out += " if (p.Type() == OutputType::json) { p.PrintKeyValue(name, value); return; }\n" - out += " auto strings = " + bitmask.name + \ - "GetStrings(static_cast<" + bitmask.name + ">(value));\n" out += " if (static_cast<" + bitmask.name + ">(value) == 0) {\n" out += " ArrayWrapper arr(p, name, 0);\n" out += " p.SetAsType().PrintString(\"None\");\n" out += " return;\n" out += " }\n" + out += " auto strings = " + bitmask.name + \ + "GetStrings(static_cast<" + bitmask.name + ">(value));\n" out += " ArrayWrapper arr(p, name, strings.size());\n" out += " for(auto& str : strings){\n" out += " p.SetAsType().PrintString(str);\n" -- cgit v1.2.3