layers: Fix reporting of multiple allowed image view types
This isn't the problem we were hitting in #890, but we'd produce a misleading message if multiple bits were allowed
Signed-off-by: Chris Forbes <chrisforbes@google.com>
diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp
index 00c0d19..9b20638 100644
--- a/layers/descriptor_sets.cpp
+++ b/layers/descriptor_sets.cpp
@@ -323,14 +323,19 @@
}
-static char const * string_descriptor_req_view_type(descriptor_req req) {
+static std::string string_descriptor_req_view_type(descriptor_req req) {
+ std::string result("");
for (unsigned i = 0; i <= VK_IMAGE_VIEW_TYPE_END_RANGE; i++) {
if (req & (1 << i)) {
- return string_VkImageViewType(VkImageViewType(i));
+ if (result.size()) result += ", ";
+ result += string_VkImageViewType(VkImageViewType(i));
}
}
- return "(none)";
+ if (!result.size())
+ result = "(none)";
+
+ return result;
}