Snap for 5178924 from d1de07835bf94527e2a0da8a39d335df0b141e50 to pie-cts-release
Change-Id: I239cc5bed0fa64f97fe8070b6f408ed1cfc4658c
diff --git a/external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp
index 8263a9d..726bbd9 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp
@@ -132,6 +132,7 @@
for (deUint32 ndx = 0; ndx < numIterations; ++ndx)
{
+ if (ndx % 1024 == 0) context.getTestContext().touchWatchdog();
// The test should crash in this loop at some point if there is a memory leak
VK_CHECK(vkd.allocateDescriptorSets(device, &descriptorSetInfo, &testSets[0]));
VK_CHECK(vkd.resetDescriptorPool(device, *descriptorPool, 0));
diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
index 7a92125..92ee61e 100755
--- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
@@ -3908,7 +3908,7 @@
const size_t bit = numOfUsageFlags + createFlagNdx;
if ((combo & (1u << bit)) == 0)
continue;
- if (((createFlags[createFlagNdx] & vk::VK_IMAGE_CREATE_PROTECTED_BIT) == vk::VK_IMAGE_CREATE_PROTECTED_BIT ) &&
+ if (((createFlags[createFlagNdx] & vk::VK_IMAGE_CREATE_PROTECTED_BIT) == vk::VK_IMAGE_CREATE_PROTECTED_BIT ) &&
(protectedFeatures.protectedMemory == VK_FALSE))
continue;
createFlag |= createFlags[createFlagNdx];
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
index 2d98125..8d09c01 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
@@ -745,7 +745,7 @@
"%BP_op_gl_PerVertexOut = OpTypePointer Output %BP_gl_PerVertexOut\n"
"%BP_stream = OpVariable %BP_op_gl_PerVertexOut Output\n"
"%BP_gl_TessCoord = OpVariable %ip_v3f32 Input\n"
- "%BP_gl_PrimitiveID = OpVariable %op_i32 Input\n"
+ "%BP_gl_PrimitiveID = OpVariable %ip_i32 Input\n"
"%BP_gl_PerVertexIn = OpTypeStruct %v4f32 %f32 %a1f32 %a1f32\n"
"%BP_a32_gl_PerVertexIn = OpTypeArray %BP_gl_PerVertexIn %c_u32_32\n"
"%BP_ip_a32_gl_PerVertexIn = OpTypePointer Input %BP_a32_gl_PerVertexIn\n"
diff --git a/modules/gles3/functional/es3fMultiviewTests.cpp b/modules/gles3/functional/es3fMultiviewTests.cpp
index 7f88926..06b1805 100644
--- a/modules/gles3/functional/es3fMultiviewTests.cpp
+++ b/modules/gles3/functional/es3fMultiviewTests.cpp
@@ -309,7 +309,7 @@
failed = true;
}
}
- else
+ else if (x > backbufferWidth / 2)
{
if (pixel.getRed() != 0 || pixel.getGreen() != 255 || pixel.getBlue() != 0)
{
