From 02739553b2bb182e722194d8aef1ed47fec7a461 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 26 Mar 2019 13:04:54 +0000 Subject: [PATCH] Make the list of memory types clearer when printing incompatible error --- .../driver/vulkan/wrappers/vk_resource_funcs.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp index 2b744e2da..490140f38 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp @@ -197,12 +197,20 @@ bool WrappedVulkan::CheckMemoryRequirements(const char *resourceName, ResourceId // verify type if((mrq.memoryTypeBits & bit) == 0) { + std::string bitsString; + + for(uint32_t i = 0; i < 32; i++) + { + if(mrq.memoryTypeBits & (1U << i)) + bitsString += StringFormat::Fmt("%s%u", bitsString.empty() ? "" : ", ", i); + } + RDCERR( "Trying to bind %s to memory %llu which is type %u, " - "but only these types are allowed: %08x.\n" + "but only these types are allowed: %s\n" "This is most likely caused by incompatible hardware or drivers between capture and " "replay, causing a change in memory requirements.", - resourceName, memOrigId, memInfo.memoryTypeIndex, mrq.memoryTypeBits); + resourceName, memOrigId, memInfo.memoryTypeIndex, bitsString.c_str()); m_FailedReplayStatus = ReplayStatus::APIHardwareUnsupported; return false; }