From 04586bce819f636fff644801c72739460413bb2b Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 31 Aug 2016 12:58:14 -0700 Subject: 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 --- layers/descriptor_sets.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'layers/descriptor_sets.cpp') diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp index 00c0d194..9b20638b 100644 --- a/layers/descriptor_sets.cpp +++ b/layers/descriptor_sets.cpp @@ -323,14 +323,19 @@ cvdescriptorset::DescriptorSet::~DescriptorSet() { } -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; } -- cgit v1.2.3