diff options
| -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 4c0ed0bf4..2c824824e 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp @@ -1418,6 +1418,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); @@ -2487,6 +2490,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 63052c948..7dddfefcc 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" @@ -180,14 +181,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]; } |