Snap for 10810697 from 13cdbbb1453b729a514771b2cfb46ffb164cff7d to udc-qpr1-releaseandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release

Change-Id: Ibb6aad190c73587caf7dba0b7a7bdd4cbf82b52a

5 files changed, 6 insertions, 4 deletions

diff --git a/android/cts/main/src/vk-master-2020-03-01.txt b/android/cts/main/src/vk-master-2020-03-01.txt
index 10c0954b3..4ab30e08d 100644
--- a/android/cts/main/src/vk-master-2020-03-01.txt
+++ b/android/cts/main/src/vk-master-2020-03-01.txt
@@ -81462,7 +81462,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.sampledimglow.lowimgnotex.iublimithigh.nouab.rgen.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.noiub.uab.comp.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.noiub.uab.frag.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.nosampledimg.outimgtexlow.noiub.uab.frag.ialimitlow.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.noiub.uab.vert.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.sampledimglow.lowimgnotex.noiub.uab.rgen.noia.0
diff --git a/android/cts/main/vk-master-2020-03-01/binding-model.txt b/android/cts/main/vk-master-2020-03-01/binding-model.txt
index 92eb261d4..a399fdba9 100644
--- a/android/cts/main/vk-master-2020-03-01/binding-model.txt
+++ b/android/cts/main/vk-master-2020-03-01/binding-model.txt
@@ -1226,7 +1226,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.iublimithigh.uab.vert.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.iublimithigh.uab.rgen.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.nosampledimg.outimgtexlow.noiub.uab.frag.ialimitlow.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.nosampledimg.outimgtexlow.iublimitlow.nouab.frag.ialimitlow.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.nosampledimg.outimgtexlow.iublimitlow.uab.frag.ialimitlow.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.nosampledimg.outimgtexlow.iublimithigh.nouab.frag.ialimitlow.0
diff --git a/android/cts/main/vk-master-2023-03-01/binding-model.txt b/android/cts/main/vk-master-2023-03-01/binding-model.txt
index 0c0411778..d6d493ba6 100644
--- a/android/cts/main/vk-master-2023-03-01/binding-model.txt
+++ b/android/cts/main/vk-master-2023-03-01/binding-model.txt
@@ -1918,6 +1918,7 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimghigh.lowimgsingletex.iublimithigh.nouab.mesh.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimghigh.lowimgsingletex.iublimithigh.uab.task.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimghigh.lowimgsingletex.iublimithigh.uab.mesh.noia.0
+dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.nosampledimg.outimgtexlow.noiub.uab.frag.ialimitlow.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.noiub.nouab.task.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.noiub.nouab.mesh.noia.0
 dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.noiub.uab.task.noia.0
diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
index 2b8db0dad..f6dc1a77e 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
@@ -3354,7 +3354,7 @@ tcu::TestStatus testMemoryImportTwice (Context& context, MemoryTestConfig config
 		};
 		vkd.getAndroidHardwareBufferPropertiesANDROID(device.get(), handleA.getAndroidHardwareBuffer(), &ahbProperties);
 
-		exportedMemoryTypeIndex	= chooseMemoryType(ahbProperties.memoryTypeBits);
+		exportedMemoryTypeIndex	= getExportedMemoryTypeIndex(vki, physicalDevice, config.hostVisible, ahbProperties.memoryTypeBits);
 	}
 
 	{
@@ -3424,7 +3424,7 @@ tcu::TestStatus testMemoryMultipleImports (Context& context, MemoryTestConfig co
 		};
 		vkd.getAndroidHardwareBufferPropertiesANDROID(device.get(), handleA.getAndroidHardwareBuffer(), &ahbProperties);
 
-		exportedMemoryTypeIndex	= chooseMemoryType(ahbProperties.memoryTypeBits);
+		exportedMemoryTypeIndex	= getExportedMemoryTypeIndex(vki, physicalDevice, config.hostVisible, ahbProperties.memoryTypeBits);
 	}
 
 	for (size_t ndx = 0; ndx < count; ndx++)
diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp
index 60863ab9a..0f0ac0fdc 100644
--- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp
+++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp
@@ -1439,6 +1439,9 @@ tcu::TestStatus InvarianceTestInstance::iterate (void)
 
 	for (int tessLevelCaseNdx = 0; tessLevelCaseNdx < static_cast<int>(tessLevelCases.size()); ++tessLevelCaseNdx)
 	{
+		if (m_caseDef.caseType == CASETYPE_INVARIANT_OUTER_TRIANGLE_SET)
+			m_context.getTestContext().touchWatchdog();
+
 		const LevelCase& levelCase = tessLevelCases[tessLevelCaseNdx];
 		PerPrimitiveVec  firstPrim;