Henri Verbeet : vkd3d: Recognise newer memory properties in debug_vk_memory_property_flags().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: ffbc40ee20a893bd97d675940ef919dac94a555a
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=ffbc40ee20a893bd97d67594...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Mar  1 13:21:36 2022 +0100

vkd3d: Recognise newer memory properties in debug_vk_memory_property_flags().

The two _AMD properties would require bumping the version of the Vulkan
headers we require; that doesn't seem worth it for making a FIXME go away.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d/utils.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c
index 873f840..5f67c8b 100644
--- a/libs/vkd3d/utils.c
+++ b/libs/vkd3d/utils.c
@@ -717,7 +717,7 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags)
 
 const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags)
 {
-    char buffer[200];
+    char buffer[320];
 
     buffer[0] = '\0';
 #define FLAG_TO_STR(f) if (flags & f) { strcat(buffer, " | "#f); flags &= ~f; }
@@ -726,6 +726,11 @@ const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags)
     FLAG_TO_STR(VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)
     FLAG_TO_STR(VK_MEMORY_PROPERTY_HOST_CACHED_BIT)
     FLAG_TO_STR(VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT)
+    FLAG_TO_STR(VK_MEMORY_PROPERTY_PROTECTED_BIT)
+#undef FLAG_TO_STR
+#define FLAG_TO_STR(f, n) if (flags & f) { strcat(buffer, " | "#n); flags &= ~f; }
+    FLAG_TO_STR(0x40, VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD)
+    FLAG_TO_STR(0x80, VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD)
 #undef FLAG_TO_STR
     if (flags)
         FIXME("Unrecognized flag(s) %#x.\n", flags);