Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/vulkan-cts-1.2.3
Change-Id: I39fda12511570ac092cc8c8759797d7c32c08bf6
diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
index 56adf53..f147b40 100644
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
@@ -3894,11 +3894,14 @@
makeCommandBuffer(context, *cmdPool));
Move<VkPipeline> *pipelines = new Move<VkPipeline>[localSizesToTestCount - 1];
+
+ context.getTestContext().touchWatchdog();
pipelines[0] =
makeComputePipeline(context, *pipelineLayout, *shaderModule,
pipelineShaderStageCreateFlags, VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT, (VkPipeline) DE_NULL,
localSizesToTest[0][0], localSizesToTest[0][1], localSizesToTest[0][2],
isRequiredSubgroupSize ? subgroupSize : 0u);
+ context.getTestContext().touchWatchdog();
for (deUint32 index = 1; index < (localSizesToTestCount - 1); index++)
{
@@ -3906,11 +3909,13 @@
const deUint32 nextY = localSizesToTest[index][1];
const deUint32 nextZ = localSizesToTest[index][2];
+ context.getTestContext().touchWatchdog();
pipelines[index] =
makeComputePipeline(context, *pipelineLayout, *shaderModule,
pipelineShaderStageCreateFlags, VK_PIPELINE_CREATE_DERIVATIVE_BIT, *pipelines[0],
nextX, nextY, nextZ,
isRequiredSubgroupSize ? subgroupSize : 0u);
+ context.getTestContext().touchWatchdog();
}
for (deUint32 index = 0; index < (localSizesToTestCount - 1); index++)
