From ace02ca84b697d54bf742c9f80ee5fc0ca19c69e Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Fri, 24 Feb 2023 15:29:00 -0700 Subject: [PATCH] vulkaninfo: Fix wrong stripping in flag strings The QUEUE_OPTICAL_FLOW_BIT_NV was getting the 'V' cut off of it, this commit fixes that so that it isn't being removed, as well as making the output more consistent. --- scripts/vulkaninfo_generator.py | 2 +- vulkaninfo/generated/vulkaninfo.hpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py index 0834a2a..cea7490 100644 --- a/scripts/vulkaninfo_generator.py +++ b/scripts/vulkaninfo_generator.py @@ -500,7 +500,7 @@ def PrintBitMaskToString(bitmask, name, gen): for v in bitmask.options: out += f" if ({v.name} & value) {{\n" out += f' if (is_first) {{ is_first = false; }} else {{ out += " | "; }}\n' - out += f' out += "{str(v.name).strip("VK_").strip("_BIT")}";\n' + out += f' out += "{str(v.name)[3:]}";\n' out += f" }}\n" out += f" return out;\n" out += f"}}\n" diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 3a3412e..6469e4a 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -942,23 +942,23 @@ std::string VkQueueFlagsString(VkQueueFlags value) { bool is_first = true; if (VK_QUEUE_GRAPHICS_BIT & value) { if (is_first) { is_first = false; } else { out += " | "; } - out += "QUEUE_GRAPHICS"; + out += "QUEUE_GRAPHICS_BIT"; } if (VK_QUEUE_COMPUTE_BIT & value) { if (is_first) { is_first = false; } else { out += " | "; } - out += "QUEUE_COMPUTE"; + out += "QUEUE_COMPUTE_BIT"; } if (VK_QUEUE_TRANSFER_BIT & value) { if (is_first) { is_first = false; } else { out += " | "; } - out += "QUEUE_TRANSFER"; + out += "QUEUE_TRANSFER_BIT"; } if (VK_QUEUE_SPARSE_BINDING_BIT & value) { if (is_first) { is_first = false; } else { out += " | "; } - out += "QUEUE_SPARSE_BINDING"; + out += "QUEUE_SPARSE_BINDING_BIT"; } if (VK_QUEUE_PROTECTED_BIT & value) { if (is_first) { is_first = false; } else { out += " | "; } - out += "QUEUE_PROTECTED"; + out += "QUEUE_PROTECTED_BIT"; } if (VK_QUEUE_VIDEO_DECODE_BIT_KHR & value) { if (is_first) { is_first = false; } else { out += " | "; } @@ -970,7 +970,7 @@ std::string VkQueueFlagsString(VkQueueFlags value) { } if (VK_QUEUE_OPTICAL_FLOW_BIT_NV & value) { if (is_first) { is_first = false; } else { out += " | "; } - out += "QUEUE_OPTICAL_FLOW_BIT_N"; + out += "QUEUE_OPTICAL_FLOW_BIT_NV"; } return out; } -- 2.7.4