summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Byszewski <piotr.byszewski@mobica.com>2023-03-23 18:40:41 +0100
committerPiotr Byszewski <piotr.byszewski@mobica.com>2023-03-23 18:40:41 +0100
commitb39d31c3881cf7c543a10eff4b69e7a91c287478 (patch)
tree961c2c337ca45c12f87c696bdf93ceb8715b4061
parentc7c083ff81e2875ebaa7d12c9aba8bd4b81a19ec (diff)
parent948ef5301e4d6c95406aa5501ea351bec47b3c65 (diff)
downloadVK-GL-CTS-b39d31c3881cf7c543a10eff4b69e7a91c287478.tar.gz
VK-GL-CTS-b39d31c3881cf7c543a10eff4b69e7a91c287478.tar.bz2
VK-GL-CTS-b39d31c3881cf7c543a10eff4b69e7a91c287478.zip
Merge vk-gl-cts/vulkan-cts-1.3.0 into vk-gl-cts/vulkan-cts-1.3.1
Change-Id: Ifd340c33afa45b9d51492f4c7e9e281682d432cf
-rw-r--r--external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp6
-rw-r--r--external/vulkancts/modules/vulkan/vktInfoTests.cpp5
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 039d0b542..acdc1abd3 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];
}