Merge vk-gl-cts/vulkan-cts-1.3.5 into vk-gl-cts/vulkan-cts-1.3.6

Change-Id: I6723571b83aee95c3c882ee5e5b263ffe544b63b
KhronosGroup · Dec 14, 2023 · cf3b94e · cf3b94e
2 parents 7ad1818 + 628a1fb
commit cf3b94e
Show file tree

Hide file tree

Showing 7 changed files with 269 additions and 378 deletions.
diff --git a/android/cts/main/vk-master-2023-03-01/graphicsfuzz.txt b/android/cts/main/vk-master-2023-03-01/graphicsfuzz.txt
@@ -81,7 +81,6 @@ dEQP-VK.graphicsfuzz.cov-loop-condition-divide-by-uniform-always-false
 dEQP-VK.graphicsfuzz.cov-loop-condition-filter-some-iterations-never-discard
 dEQP-VK.graphicsfuzz.cov-loop-condition-increment-integer-fallback-global-counter
 dEQP-VK.graphicsfuzz.cov-loop-construct-vec4-from-vec4-clamp-same-min-max
-dEQP-VK.graphicsfuzz.cov-loop-copy-previous-array-element-first-undefined
 dEQP-VK.graphicsfuzz.cov-loop-decrease-integer-never-break
 dEQP-VK.graphicsfuzz.cov-loop-decrease-vector-component-only-first-iteration
 dEQP-VK.graphicsfuzz.cov-loop-decrease-vector-components-assign-multiple-times

diff --git a/...data/vulkan/amber/graphicsfuzz/cov-loop-copy-previous-array-element-first-undefined.amber b/...data/vulkan/amber/graphicsfuzz/cov-loop-copy-previous-array-element-first-undefined.amber
diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt b/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt
@@ -347,7 +347,6 @@
 {	"cov-loop-condition-logical-or-never-iterated.amber",										"cov-loop-condition-logical-or-never-iterated",										"A fragment shader that covers specific LLVM code paths"							},
 {	"cov-loop-decrease-integer-never-break.amber",												"cov-loop-decrease-integer-never-break",											"A fragment shader that covers specific LLVM code paths"							},
 {	"cov-loop-construct-vec4-from-vec4-clamp-same-min-max.amber",								"cov-loop-construct-vec4-from-vec4-clamp-same-min-max",								"A fragment shader that covers specific LLVM code paths"							},
-{	"cov-loop-copy-previous-array-element-first-undefined.amber",								"cov-loop-copy-previous-array-element-first-undefined",								"A fragment shader that covers specific LLVM code paths"							},
 {	"cov-loop-decrease-vector-components-assign-multiple-times.amber",							"cov-loop-decrease-vector-components-assign-multiple-times",						"A fragment shader that covers specific LLVM code paths"							},
 {	"cov-loop-decrease-vector-component-only-first-iteration.amber",							"cov-loop-decrease-vector-component-only-first-iteration",							"A fragment shader that covers specific LLVM code paths"							},
 {	"cov-loop-dfdx-constant-divide.amber",														"cov-loop-dfdx-constant-divide",													"A fragment shader that covers specific patch optimization code paths"				},

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -6725,6 +6725,7 @@ tcu::TestStatus testNoUnknownExtensions (Context& context)
 	allowedDeviceExtensions.insert("VK_GOOGLE_display_timing");
 	allowedDeviceExtensions.insert("VK_GOOGLE_decorate_string");
 	allowedDeviceExtensions.insert("VK_GOOGLE_hlsl_functionality1");
+	allowedDeviceExtensions.insert("VK_GOOGLE_user_type");
 	allowedInstanceExtensions.insert("VK_GOOGLE_surfaceless_query");
 
 	// Instance extensions