From 37a259a5b2c94cfd6abd4a6bc33a463102830cc2 Mon Sep 17 00:00:00 2001 From: Andrew Poole Date: Tue, 4 Apr 2023 11:41:15 +0100 Subject: vulkaninfo: Add "VK_" prefix for PrintFlagBits For types like VkSampleCountFlagBits a "VK_" prefix will be added for JSON outputs. This makes the behaviour consistent for all JSON output. --- scripts/vulkaninfo_generator.py | 8 +- vulkaninfo/generated/vulkaninfo.hpp | 144 +++++++++++++++++++++++++++--------- 2 files changed, 114 insertions(+), 38 deletions(-) diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py index cea74909..a66d1d6a 100644 --- a/scripts/vulkaninfo_generator.py +++ b/scripts/vulkaninfo_generator.py @@ -475,8 +475,12 @@ def PrintFlags(bitmask, name): def PrintFlagBits(bitmask): return f"""void Dump{bitmask.name}(Printer &p, std::string name, {bitmask.name} value) {{ auto strings = {bitmask.name}GetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) {{ + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + }} }} """ diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 6c685e21..6e509e0a 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -570,8 +570,12 @@ void DumpVkCompositeAlphaFlagsKHR(Printer &p, std::string name, VkCompositeAlpha } void DumpVkCompositeAlphaFlagBitsKHR(Printer &p, std::string name, VkCompositeAlphaFlagBitsKHR value) { auto strings = VkCompositeAlphaFlagBitsKHRGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkDeviceGroupPresentModeFlagBitsKHRGetStrings(VkDeviceGroupPresentModeFlagBitsKHR value) { @@ -601,8 +605,12 @@ void DumpVkDeviceGroupPresentModeFlagsKHR(Printer &p, std::string name, VkDevice } void DumpVkDeviceGroupPresentModeFlagBitsKHR(Printer &p, std::string name, VkDeviceGroupPresentModeFlagBitsKHR value) { auto strings = VkDeviceGroupPresentModeFlagBitsKHRGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkFormatFeatureFlagBitsGetStrings(VkFormatFeatureFlagBits value) { @@ -659,8 +667,12 @@ void DumpVkFormatFeatureFlags(Printer &p, std::string name, VkFormatFeatureFlags } void DumpVkFormatFeatureFlagBits(Printer &p, std::string name, VkFormatFeatureFlagBits value) { auto strings = VkFormatFeatureFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkFormatFeatureFlagBits2GetStrings(VkFormatFeatureFlagBits2 value) { @@ -728,8 +740,12 @@ void DumpVkFormatFeatureFlags2(Printer &p, std::string name, VkFormatFeatureFlag } void DumpVkFormatFeatureFlagBits2(Printer &p, std::string name, VkFormatFeatureFlagBits2 value) { auto strings = VkFormatFeatureFlagBits2GetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkImageUsageFlagBitsGetStrings(VkImageUsageFlagBits value) { @@ -775,8 +791,12 @@ void DumpVkImageUsageFlags(Printer &p, std::string name, VkImageUsageFlags value } void DumpVkImageUsageFlagBits(Printer &p, std::string name, VkImageUsageFlagBits value) { auto strings = VkImageUsageFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkMemoryHeapFlagBitsGetStrings(VkMemoryHeapFlagBits value) { @@ -804,8 +824,12 @@ void DumpVkMemoryHeapFlags(Printer &p, std::string name, VkMemoryHeapFlags value } void DumpVkMemoryHeapFlagBits(Printer &p, std::string name, VkMemoryHeapFlagBits value) { auto strings = VkMemoryHeapFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkMemoryPropertyFlagBitsGetStrings(VkMemoryPropertyFlagBits value) { @@ -840,8 +864,12 @@ void DumpVkMemoryPropertyFlags(Printer &p, std::string name, VkMemoryPropertyFla } void DumpVkMemoryPropertyFlagBits(Printer &p, std::string name, VkMemoryPropertyFlagBits value) { auto strings = VkMemoryPropertyFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkPresentGravityFlagBitsEXTGetStrings(VkPresentGravityFlagBitsEXT value) { @@ -870,8 +898,12 @@ void DumpVkPresentGravityFlagsEXT(Printer &p, std::string name, VkPresentGravity } void DumpVkPresentGravityFlagBitsEXT(Printer &p, std::string name, VkPresentGravityFlagBitsEXT value) { auto strings = VkPresentGravityFlagBitsEXTGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkPresentScalingFlagBitsEXTGetStrings(VkPresentScalingFlagBitsEXT value) { @@ -900,8 +932,12 @@ void DumpVkPresentScalingFlagsEXT(Printer &p, std::string name, VkPresentScaling } void DumpVkPresentScalingFlagBitsEXT(Printer &p, std::string name, VkPresentScalingFlagBitsEXT value) { auto strings = VkPresentScalingFlagBitsEXTGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkQueueFlagBitsGetStrings(VkQueueFlagBits value) { @@ -935,8 +971,12 @@ void DumpVkQueueFlags(Printer &p, std::string name, VkQueueFlags value) { } void DumpVkQueueFlagBits(Printer &p, std::string name, VkQueueFlagBits value) { auto strings = VkQueueFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::string VkQueueFlagsString(VkQueueFlags value) { @@ -1003,8 +1043,12 @@ void DumpVkResolveModeFlags(Printer &p, std::string name, VkResolveModeFlags val } void DumpVkResolveModeFlagBits(Printer &p, std::string name, VkResolveModeFlagBits value) { auto strings = VkResolveModeFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkSampleCountFlagBitsGetStrings(VkSampleCountFlagBits value) { @@ -1037,8 +1081,12 @@ void DumpVkSampleCountFlags(Printer &p, std::string name, VkSampleCountFlags val } void DumpVkSampleCountFlagBits(Printer &p, std::string name, VkSampleCountFlagBits value) { auto strings = VkSampleCountFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkShaderStageFlagBitsGetStrings(VkShaderStageFlagBits value) { @@ -1080,8 +1128,12 @@ void DumpVkShaderStageFlags(Printer &p, std::string name, VkShaderStageFlags val } void DumpVkShaderStageFlagBits(Printer &p, std::string name, VkShaderStageFlagBits value) { auto strings = VkShaderStageFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkSubgroupFeatureFlagBitsGetStrings(VkSubgroupFeatureFlagBits value) { @@ -1116,8 +1168,12 @@ void DumpVkSubgroupFeatureFlags(Printer &p, std::string name, VkSubgroupFeatureF } void DumpVkSubgroupFeatureFlagBits(Printer &p, std::string name, VkSubgroupFeatureFlagBits value) { auto strings = VkSubgroupFeatureFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkSurfaceCounterFlagBitsEXTGetStrings(VkSurfaceCounterFlagBitsEXT value) { @@ -1144,8 +1200,12 @@ void DumpVkSurfaceCounterFlagsEXT(Printer &p, std::string name, VkSurfaceCounter } void DumpVkSurfaceCounterFlagBitsEXT(Printer &p, std::string name, VkSurfaceCounterFlagBitsEXT value) { auto strings = VkSurfaceCounterFlagBitsEXTGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkSurfaceTransformFlagBitsKHRGetStrings(VkSurfaceTransformFlagBitsKHR value) { @@ -1180,8 +1240,12 @@ void DumpVkSurfaceTransformFlagsKHR(Printer &p, std::string name, VkSurfaceTrans } void DumpVkSurfaceTransformFlagBitsKHR(Printer &p, std::string name, VkSurfaceTransformFlagBitsKHR value) { auto strings = VkSurfaceTransformFlagBitsKHRGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkToolPurposeFlagBitsGetStrings(VkToolPurposeFlagBits value) { @@ -1214,8 +1278,12 @@ void DumpVkToolPurposeFlags(Printer &p, std::string name, VkToolPurposeFlags val } void DumpVkToolPurposeFlagBits(Printer &p, std::string name, VkToolPurposeFlagBits value) { auto strings = VkToolPurposeFlagBitsGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } std::vector VkVideoCodecOperationFlagBitsKHRGetStrings(VkVideoCodecOperationFlagBitsKHR value) { @@ -1245,8 +1313,12 @@ void DumpVkVideoCodecOperationFlagsKHR(Printer &p, std::string name, VkVideoCode } void DumpVkVideoCodecOperationFlagBitsKHR(Printer &p, std::string name, VkVideoCodecOperationFlagBitsKHR value) { auto strings = VkVideoCodecOperationFlagBitsKHRGetStrings(value); - if (strings.size() > 0) - p.PrintKeyString(name, strings.at(0)); + if (strings.size() > 0) { + if (p.Type() == OutputType::json) + p.PrintKeyString(name, std::string("VK_") + strings.at(0)); + else + p.PrintKeyString(name, strings.at(0)); + } } void DumpVkConformanceVersion(Printer &p, std::string name, const VkConformanceVersion &obj) { -- cgit v1.2.3