Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...

am: 2585331908

Change-Id: Ide25b381041f3c545b53906842a2caa7733b7ddc

diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index 8b19c1f..58683c6 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -207677,9 +207677,36 @@
                                                <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
deleted file mode 100644 (file)
index ec64ff9..0000000
--- a/android/cts/master/src/vulkan-driver-issues.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 b2402bf..4e07680 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -63886,7 +63886,16 @@ 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 d6c87b4..4139e10 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -354,8 +354,7 @@ MASTER_VULKAN_FILTERS                       = [
                include("vulkan-master.txt"),
                exclude("vulkan-not-applicable.txt"),
                exclude("vulkan-test-issues.txt"),
-               exclude("vulkan-hw-issues.txt"),
-               exclude("vulkan-driver-issues.txt")
+               exclude("vulkan-hw-issues.txt")
        ]
 MASTER_VULKAN_PKG                              = Package(module = VULKAN_MODULE, configurations = [
                Configuration(name                      = "master",