Remove cube map tests affected by HW issues.
Bug: 27598329
Change-Id: I2ea80e847aa85dff2aed079c5f225a2535374e8d
diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index f00f8cd..769501d 100644
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -137819,9 +137819,6 @@
</Test>
</TestCase>
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -138208,9 +138205,6 @@
</Test>
</TestCase>
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -138644,9 +138638,6 @@
</Test>
</TestCase>
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -138924,9 +138915,6 @@
</Test>
</TestCase>
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -140115,9 +140103,6 @@
</TestSuite>
<TestSuite name="etc2_r8g8b8_srgb_block">
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -140239,9 +140224,6 @@
</TestSuite>
<TestSuite name="etc2_r8g8b8a1_srgb_block">
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -140363,9 +140345,6 @@
</TestSuite>
<TestSuite name="etc2_r8g8b8a8_srgb_block">
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -141585,9 +141564,6 @@
</Test>
</TestCase>
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -141974,9 +141950,6 @@
</Test>
</TestCase>
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -142410,9 +142383,6 @@
</Test>
</TestCase>
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -142690,9 +142660,6 @@
</Test>
</TestCase>
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -143881,9 +143848,6 @@
</TestSuite>
<TestSuite name="etc2_r8g8b8_srgb_block">
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -144005,9 +143969,6 @@
</TestSuite>
<TestSuite name="etc2_r8g8b8a1_srgb_block">
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
@@ -144129,9 +144090,6 @@
</TestSuite>
<TestSuite name="etc2_r8g8b8a8_srgb_block">
<TestCase name="mag_filter">
- <Test name="linear">
- <TestInstance/>
- </Test>
<Test name="nearest">
<TestInstance/>
</Test>
diff --git a/android/cts/master/src/vulkan-hw-issues.txt b/android/cts/master/src/vulkan-hw-issues.txt
new file mode 100644
index 0000000..1064c42
--- /dev/null
+++ b/android/cts/master/src/vulkan-hw-issues.txt
@@ -0,0 +1,16 @@
+# Bug 27598329
+dEQP-VK.pipeline.sampler.view_type.cube.format.a2b10g10r10_unorm_pack32.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube_array.format.a2b10g10r10_unorm_pack32.mag_filter.linear
+
+dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8_srgb_block.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a1_srgb_block.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a8_srgb_block.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube.format.r8_srgb.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8_srgb.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8b8a8_srgb.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8_srgb_block.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a1_srgb_block.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a8_srgb_block.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8_srgb.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8_srgb.mag_filter.linear
+dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8b8a8_srgb.mag_filter.linear
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 8a87b29..00db00a 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -43289,7 +43289,6 @@
dEQP-VK.pipeline.sampler.view_type.cube.format.r5g5b5a1_unorm_pack16.mipmap.linear.lod.select_bias_3_7
dEQP-VK.pipeline.sampler.view_type.cube.format.a2b10g10r10_unorm_pack32.min_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.a2b10g10r10_unorm_pack32.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube.format.a2b10g10r10_unorm_pack32.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.a2b10g10r10_unorm_pack32.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube.format.a2b10g10r10_unorm_pack32.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube.format.a2b10g10r10_unorm_pack32.mipmap.nearest.lod.select_min_1
@@ -43388,7 +43387,6 @@
dEQP-VK.pipeline.sampler.view_type.cube.format.b5g5r5a1_unorm_pack16.mipmap.linear.lod.select_bias_3_7
dEQP-VK.pipeline.sampler.view_type.cube.format.r8_srgb.min_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.r8_srgb.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube.format.r8_srgb.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.r8_srgb.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube.format.r8_srgb.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube.format.r8_srgb.mipmap.nearest.lod.select_min_1
@@ -43496,7 +43494,6 @@
dEQP-VK.pipeline.sampler.view_type.cube.format.r8_sint.mipmap.nearest.lod.select_bias_3_7
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8b8a8_srgb.min_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8b8a8_srgb.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8b8a8_srgb.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8b8a8_srgb.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8b8a8_srgb.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8b8a8_srgb.mipmap.nearest.lod.select_min_1
@@ -43568,7 +43565,6 @@
dEQP-VK.pipeline.sampler.view_type.cube.format.b8g8r8_srgb.mipmap.linear.lod.select_bias_3_7
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8_srgb.min_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8_srgb.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8_srgb.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8_srgb.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8_srgb.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube.format.r8g8_srgb.mipmap.nearest.lod.select_min_1
@@ -43861,7 +43857,6 @@
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8_unorm_block.mipmap.linear.lod.select_bias_2_5
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8_unorm_block.mipmap.linear.lod.select_bias_3_1
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8_unorm_block.mipmap.linear.lod.select_bias_3_7
-dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8_srgb_block.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8_srgb_block.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8_srgb_block.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8_srgb_block.mipmap.nearest.lod.select_min_1
@@ -43893,7 +43888,6 @@
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a1_unorm_block.mipmap.linear.lod.select_bias_2_5
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a1_unorm_block.mipmap.linear.lod.select_bias_3_1
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a1_unorm_block.mipmap.linear.lod.select_bias_3_7
-dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a1_srgb_block.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a1_srgb_block.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a1_srgb_block.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a1_srgb_block.mipmap.nearest.lod.select_min_1
@@ -43925,7 +43919,6 @@
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a8_unorm_block.mipmap.linear.lod.select_bias_2_5
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a8_unorm_block.mipmap.linear.lod.select_bias_3_1
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a8_unorm_block.mipmap.linear.lod.select_bias_3_7
-dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a8_srgb_block.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a8_srgb_block.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a8_srgb_block.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube.format.etc2_r8g8b8a8_srgb_block.mipmap.nearest.lod.select_min_1
@@ -44239,7 +44232,6 @@
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r5g5b5a1_unorm_pack16.mipmap.linear.lod.select_bias_3_7
dEQP-VK.pipeline.sampler.view_type.cube_array.format.a2b10g10r10_unorm_pack32.min_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.a2b10g10r10_unorm_pack32.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube_array.format.a2b10g10r10_unorm_pack32.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.a2b10g10r10_unorm_pack32.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube_array.format.a2b10g10r10_unorm_pack32.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube_array.format.a2b10g10r10_unorm_pack32.mipmap.nearest.lod.select_min_1
@@ -44338,7 +44330,6 @@
dEQP-VK.pipeline.sampler.view_type.cube_array.format.b5g5r5a1_unorm_pack16.mipmap.linear.lod.select_bias_3_7
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8_srgb.min_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8_srgb.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8_srgb.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8_srgb.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8_srgb.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8_srgb.mipmap.nearest.lod.select_min_1
@@ -44446,7 +44437,6 @@
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8_sint.mipmap.nearest.lod.select_bias_3_7
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8b8a8_srgb.min_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8b8a8_srgb.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8b8a8_srgb.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8b8a8_srgb.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8b8a8_srgb.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8b8a8_srgb.mipmap.nearest.lod.select_min_1
@@ -44518,7 +44508,6 @@
dEQP-VK.pipeline.sampler.view_type.cube_array.format.b8g8r8_srgb.mipmap.linear.lod.select_bias_3_7
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8_srgb.min_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8_srgb.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8_srgb.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8_srgb.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8_srgb.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube_array.format.r8g8_srgb.mipmap.nearest.lod.select_min_1
@@ -44811,7 +44800,6 @@
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8_unorm_block.mipmap.linear.lod.select_bias_2_5
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8_unorm_block.mipmap.linear.lod.select_bias_3_1
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8_unorm_block.mipmap.linear.lod.select_bias_3_7
-dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8_srgb_block.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8_srgb_block.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8_srgb_block.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8_srgb_block.mipmap.nearest.lod.select_min_1
@@ -44843,7 +44831,6 @@
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a1_unorm_block.mipmap.linear.lod.select_bias_2_5
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a1_unorm_block.mipmap.linear.lod.select_bias_3_1
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a1_unorm_block.mipmap.linear.lod.select_bias_3_7
-dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a1_srgb_block.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a1_srgb_block.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a1_srgb_block.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a1_srgb_block.mipmap.nearest.lod.select_min_1
@@ -44875,7 +44862,6 @@
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a8_unorm_block.mipmap.linear.lod.select_bias_2_5
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a8_unorm_block.mipmap.linear.lod.select_bias_3_1
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a8_unorm_block.mipmap.linear.lod.select_bias_3_7
-dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a8_srgb_block.mag_filter.linear
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a8_srgb_block.mag_filter.nearest
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a8_srgb_block.mipmap.nearest.lod.equal_min_3_max_3
dEQP-VK.pipeline.sampler.view_type.cube_array.format.etc2_r8g8b8a8_srgb_block.mipmap.nearest.lod.select_min_1
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 27b520a..9908b9d 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -332,7 +332,8 @@
MASTER_VULKAN_FILTERS = [
include("vulkan-master.txt"),
- exclude("vulkan-test-issues.txt")
+ exclude("vulkan-test-issues.txt"),
+ exclude("vulkan-hw-issues.txt")
]
MASTER_VULKAN_PKG = Package(module = VULKAN_MODULE, configurations = [
Configuration(name = "master",