From d8beb0ee78a14211dacdc291633dabd067a2f7e9 Mon Sep 17 00:00:00 2001 From: Denis Pauk Date: Sun, 17 Jul 2022 20:09:20 +0300 Subject: [PATCH] Update messages --- src/vk/vk_common.c | 2 +- src/vk/vk_util.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/vk/vk_common.c b/src/vk/vk_common.c index eb2ed0d..3fde8ec 100644 --- a/src/vk/vk_common.c +++ b/src/vk/vk_common.c @@ -311,7 +311,7 @@ static VkSampleCountFlagBits GetSampleCount(int msaa, VkSampleCountFlagBits supp step ++; } - R_Printf(PRINT_ALL, "MSAAx%d is used...\n", value); + R_Printf(PRINT_ALL, "...MSAAx%d is used\n", value); return msaaModes[step]; } diff --git a/src/vk/vk_util.c b/src/vk/vk_util.c index e255140..87ef83d 100644 --- a/src/vk/vk_util.c +++ b/src/vk/vk_util.c @@ -70,17 +70,18 @@ static void memory_type_print(VkMemoryPropertyFlags mem_prop) { #define MPSTR(r, prop) \ - if((prop & VK_ ##r) != 0) \ - { R_Printf(PRINT_ALL, " %s", "VK_"#r); }; + if((prop & VK_MEMORY_PROPERTY_ ##r) != 0) \ + { R_Printf(PRINT_ALL, " %s", "VK_MEMORY_PROPERTY_"#r); }; \ - MPSTR(MEMORY_PROPERTY_DEVICE_LOCAL_BIT, mem_prop); - MPSTR(MEMORY_PROPERTY_HOST_VISIBLE_BIT, mem_prop); - MPSTR(MEMORY_PROPERTY_HOST_COHERENT_BIT, mem_prop); - MPSTR(MEMORY_PROPERTY_HOST_CACHED_BIT, mem_prop); - MPSTR(MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT, mem_prop); - MPSTR(MEMORY_PROPERTY_PROTECTED_BIT, mem_prop); - MPSTR(MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD, mem_prop); - MPSTR(MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD, mem_prop); + MPSTR(DEVICE_LOCAL_BIT, mem_prop); + MPSTR(HOST_VISIBLE_BIT, mem_prop); + MPSTR(HOST_COHERENT_BIT, mem_prop); + MPSTR(HOST_CACHED_BIT, mem_prop); + MPSTR(LAZILY_ALLOCATED_BIT, mem_prop); + MPSTR(PROTECTED_BIT, mem_prop); + MPSTR(DEVICE_COHERENT_BIT_AMD, mem_prop); + MPSTR(DEVICE_UNCACHED_BIT_AMD, mem_prop); + MPSTR(RDMA_CAPABLE_BIT_NV, mem_prop); #undef PMSTR }