From: Pyry Haulos <phaulos@google.com>
Date: Wed, 4 Jan 2017 00:45:19 +0000 (-0800)
Subject: DO NOT MERGE: Remove a few changed Vulkan tests from mustpass
X-Git-Tag: upstream/0.1.0~445^2~58^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09e8b66d03077e9a9b310145112cfd0e747e06f3;p=platform%2Fupstream%2FVK-GL-CTS.git

DO NOT MERGE: Remove a few changed Vulkan tests from mustpass

Original NYC CTS was decorating struct member locations differently and
this was later fixed causing drivers that pass original NYC CTS fail.

Bug: 34060750
Bug: 33041922
Change-Id: I3fe33960a74fb8f568aa7e1327bc09de8bc3df41
---

diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index 58683c6..8b19c1f 100644
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -207677,36 +207677,9 @@
 						<Test name="mat4">
 							<TestInstance/>
 						</Test>
-						<Test name="int">
-							<TestInstance/>
-						</Test>
-						<Test name="ivec2">
-							<TestInstance/>
-						</Test>
-						<Test name="ivec3">
-							<TestInstance/>
-						</Test>
-						<Test name="ivec4">
-							<TestInstance/>
-						</Test>
-						<Test name="uint">
-							<TestInstance/>
-						</Test>
-						<Test name="uvec2">
-							<TestInstance/>
-						</Test>
-						<Test name="uvec3">
-							<TestInstance/>
-						</Test>
-						<Test name="uvec4">
-							<TestInstance/>
-						</Test>
 						<Test name="float_vec3">
 							<TestInstance/>
 						</Test>
-						<Test name="float_uvec2_vec3">
-							<TestInstance/>
-						</Test>
 					</TestCase>
 					<TestCase name="interpolation">
 						<Test name="smooth">
diff --git a/android/cts/master/src/vulkan-driver-issues.txt b/android/cts/master/src/vulkan-driver-issues.txt
new file mode 100644
index 0000000..ec64ff9
--- /dev/null
+++ b/android/cts/master/src/vulkan-driver-issues.txt
@@ -0,0 +1,10 @@
+# Bug: 33041922
+dEQP-VK.glsl.linkage.varying.struct.int
+dEQP-VK.glsl.linkage.varying.struct.ivec2
+dEQP-VK.glsl.linkage.varying.struct.ivec3
+dEQP-VK.glsl.linkage.varying.struct.ivec4
+dEQP-VK.glsl.linkage.varying.struct.uint
+dEQP-VK.glsl.linkage.varying.struct.uvec2
+dEQP-VK.glsl.linkage.varying.struct.uvec3
+dEQP-VK.glsl.linkage.varying.struct.uvec4
+dEQP-VK.glsl.linkage.varying.struct.float_uvec2_vec3
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 4e07680..b2402bf 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -63886,16 +63886,7 @@ dEQP-VK.glsl.linkage.varying.struct.mat3x4
 dEQP-VK.glsl.linkage.varying.struct.mat4x2
 dEQP-VK.glsl.linkage.varying.struct.mat4x3
 dEQP-VK.glsl.linkage.varying.struct.mat4
-dEQP-VK.glsl.linkage.varying.struct.int
-dEQP-VK.glsl.linkage.varying.struct.ivec2
-dEQP-VK.glsl.linkage.varying.struct.ivec3
-dEQP-VK.glsl.linkage.varying.struct.ivec4
-dEQP-VK.glsl.linkage.varying.struct.uint
-dEQP-VK.glsl.linkage.varying.struct.uvec2
-dEQP-VK.glsl.linkage.varying.struct.uvec3
-dEQP-VK.glsl.linkage.varying.struct.uvec4
 dEQP-VK.glsl.linkage.varying.struct.float_vec3
-dEQP-VK.glsl.linkage.varying.struct.float_uvec2_vec3
 dEQP-VK.glsl.linkage.varying.interpolation.smooth
 dEQP-VK.glsl.linkage.varying.interpolation.centroid
 dEQP-VK.glsl.linkage.varying.interpolation.flat
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 4139e10..d6c87b4 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -354,7 +354,8 @@ MASTER_VULKAN_FILTERS			= [
 		include("vulkan-master.txt"),
 		exclude("vulkan-not-applicable.txt"),
 		exclude("vulkan-test-issues.txt"),
-		exclude("vulkan-hw-issues.txt")
+		exclude("vulkan-hw-issues.txt"),
+		exclude("vulkan-driver-issues.txt")
 	]
 MASTER_VULKAN_PKG				= Package(module = VULKAN_MODULE, configurations = [
 		Configuration(name			= "master",