diff options
| author | Piotr Byszewski <piotr.byszewski@mobica.com> | 2023-03-23 19:10:08 +0100 |
|---|---|---|
| committer | Piotr Byszewski <piotr.byszewski@mobica.com> | 2023-03-23 19:10:08 +0100 |
| commit | d9f34e4df3b8c6d8d76b150763826082db810682 (patch) | |
| tree | a05b61e20a4856fa12161b57c0c1c719505cc6af | |
| parent | 9f159c01c896921efb08226fed319a5674e0755c (diff) | |
| parent | b39d31c3881cf7c543a10eff4b69e7a91c287478 (diff) | |
| download | VK-GL-CTS-d9f34e4df3b8c6d8d76b150763826082db810682.tar.gz VK-GL-CTS-d9f34e4df3b8c6d8d76b150763826082db810682.tar.bz2 VK-GL-CTS-d9f34e4df3b8c6d8d76b150763826082db810682.zip | |
Merge vk-gl-cts/vulkan-cts-1.3.1 into vk-gl-cts/vulkan-cts-1.3.2
Change-Id: I706ade7ca212a105d673a8c2199f78f3f54ea0ed
| -rw-r--r-- | external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp | 6 | ||||
| -rw-r--r-- | external/vulkancts/modules/vulkan/vktInfoTests.cpp | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp index 2516ba726..7f3f05db4 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp @@ -1448,6 +1448,9 @@ tcu::TestStatus testSemaphoreMultipleExports (Context& context, { NativeHandle handle; + // Need to touch watchdog due to how long one iteration takes + context.getTestContext().touchWatchdog(); + if (transference == TRANSFERENCE_COPY) { submitAtomicCalculationsAndGetSemaphoreNative(context, vkd, *device, alloc, queue, queueFamilyIndex, *semaphore, config.externalType, handle); @@ -2517,6 +2520,9 @@ tcu::TestStatus testFenceMultipleExports (Context& context, { NativeHandle handle; + // Need to touch watchdog due to how long one iteration takes + context.getTestContext().touchWatchdog(); + if (transference == TRANSFERENCE_COPY) { submitAtomicCalculationsAndGetFenceNative(context, vkd, *device, alloc, queue, queueFamilyIndex, *fence, config.externalType, handle, exportNdx == 0 /* expect fence to be signaled after first pass */); diff --git a/external/vulkancts/modules/vulkan/vktInfoTests.cpp b/external/vulkancts/modules/vulkan/vktInfoTests.cpp index bdfeab864..6fab27ec4 100644 --- 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" @@ -182,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]; } |