Merge vk-gl-cts/vulkan-cts-1.3.0 into vk-gl-cts/vulkan-cts-1.3.1

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / vktInfoTests.cpp

diff --git a/external/vulkancts/modules/vulkan/vktInfoTests.cpp b/external/vulkancts/modules/vulkan/vktInfoTests.cpp
index 9797bfb..6fab27e 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktInfoTests.cpp
+++ b/external/vulkancts/modules/vulkan/vktInfoTests.cpp
@@ -29,6 +29,7 @@
 #include "tcuFormatUtil.hpp"
 #include "tcuCommandLine.hpp"
 #include "tcuPlatform.hpp"
+#include "deDefs.h"
 #include "deStringUtil.hpp"
 #include "vktApiFeatureInfo.hpp"
 
@@ -84,6 +85,8 @@ std::string getCpuName (int cpu)
                case DE_CPU_ARM_64:             return "DE_CPU_ARM_64";
                case DE_CPU_MIPS:               return "DE_CPU_MIPS";
                case DE_CPU_MIPS_64:    return "DE_CPU_MIPS_64";
+               case DE_CPU_RISCV_32:   return "DE_CPU_RISCV_32";
+               case DE_CPU_RISCV_64:   return "DE_CPU_RISCV_64";
                default:
                        return de::toString(cpu);
        }
@@ -180,14 +183,16 @@ const SizeUnit* getBestSizeUnit (deUint64 value)
        {
                // \note Must be ordered from largest to smallest
                { "TiB",        1ull<<40ull             },
-               { "MiB",        1ull<<20ull             },
                { "GiB",        1ull<<30ull             },
+               { "MiB",        1ull<<20ull             },
                { "KiB",        1ull<<10ull             },
        };
        static const SizeUnit s_defaultUnit     = { "B", 1u };
 
        for (int ndx = 0; ndx < DE_LENGTH_OF_ARRAY(s_units); ++ndx)
        {
+               DE_ASSERT(ndx == DE_LENGTH_OF_ARRAY(s_units) ||
+                         s_units[ndx].value > s_units[ndx + 1].value);
                if (value >= s_units[ndx].value)
                        return &s_units[ndx];
        }
@@ -217,9 +222,9 @@ PrettySize<SizeType> prettySize (SizeType value, int precision = 2)
 tcu::TestStatus logPlatformMemoryLimits (Context& context)
 {
        TestLog&                                        log                     = context.getTestContext().getLog();
-       vk::PlatformMemoryLimits        limits;
+       tcu::PlatformMemoryLimits       limits;
 
-       context.getTestContext().getPlatform().getVulkanPlatform().getMemoryLimits(limits);
+       context.getTestContext().getPlatform().getMemoryLimits(limits);
 
        log << TestLog::Message << "totalSystemMemory = " << prettySize(limits.totalSystemMemory) << " (" << limits.totalSystemMemory << ")\n"
                                                        << "totalDeviceLocalMemory = " << prettySize(limits.totalDeviceLocalMemory) << " (" << limits.totalDeviceLocalMemory << ")\n"