diff options
| author | Charles Giessen <charles@lunarg.com> | 2020-01-24 12:11:38 -0700 |
|---|---|---|
| committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2020-01-24 12:40:34 -0700 |
| commit | 3bcfe6b062cfdb85ca88a8ef2ada563213367dcc (patch) | |
| tree | ac6daa84e69ac551e320edfbdad0261d3ed5ccb7 | |
| parent | 93ab50fc27de5a2075535be35dd76b14138d46f2 (diff) | |
| download | usermoji-3bcfe6b062cfdb85ca88a8ef2ada563213367dcc.tar.xz | |
vulkaninfo: remove duplicate flags/bitmasks
Tooling info added flags for different purposes, however they let the debug utils, debug report
and debug marker extensions use the same bitpos values for the same flags.
The autogen didn't consider this possibly, and would output the flags multiple times.
Changes to be committed:
modified: scripts/vulkaninfo_generator.py
modified: vulkaninfo/generated/vulkaninfo.hpp
Change-Id: I7c7a648d9051f8ce2876083dfb0d2ddc2eb7ca95
| -rw-r--r-- | scripts/vulkaninfo_generator.py | 7 | ||||
| -rw-r--r-- | vulkaninfo/generated/vulkaninfo.hpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py index 7537f710..6f2d1d94 100644 --- a/scripts/vulkaninfo_generator.py +++ b/scripts/vulkaninfo_generator.py @@ -788,6 +788,13 @@ class VulkanBitmask: if(support == "disabled"): continue + duplicate = False + for option in self.options: + if option.name == childName: + duplicate = True + if duplicate: + continue + self.options.append(VulkanEnum.Option( childName, childValue, childBitpos, childComment)) diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 01bb0113..b242f028 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -782,8 +782,6 @@ void DumpVkToolPurposeFlagsEXT(Printer &p, std::string name, VkToolPurposeFlagBi if (16 & value) p.SetAsType().PrintElement("TOOL_PURPOSE_MODIFYING_FEATURES_BIT_EXT"); if (32 & value) p.SetAsType().PrintElement("TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT"); if (64 & value) p.SetAsType().PrintElement("TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT"); - if (32 & value) p.SetAsType().PrintElement("TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT"); - if (64 & value) p.SetAsType().PrintElement("TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT"); } void DumpVkToolPurposeFlagsEXT(Printer &p, std::string name, VkToolPurposeFlagsEXT value, int width = 0) { if (p.Type() == OutputType::json) { p.PrintKeyValue(name, value); return; } |