am ba29eb39: am a22a71f1: am 27f6f9f6: Remove GLES3 attribute location aliasing tests from must pass set
* commit 'ba29eb39cbd844b16f8ff3dc9ad07803a5a19844':
Remove GLES3 attribute location aliasing tests from must pass set
diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index adaa5c6..0f77fb2 100644
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -121329,80 +121329,6 @@
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
</TestCase>
- <TestCase name="bind_aliasing">
- <Test name="cond_float">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_cond_float">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_inactive_float">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_vec2">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_cond_vec2">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_inactive_vec2">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_vec3">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_cond_vec3">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_inactive_vec3">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_vec4">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_cond_vec4">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_inactive_vec4">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_mat2">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_mat2_offset_1">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_cond_mat2">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_inactive_mat2">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_mat3">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_mat3_offset_1">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_cond_mat3">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_inactive_mat3">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_mat4">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="cond_mat4_offset_1">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_cond_mat4">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="max_inactive_mat4">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- </TestCase>
<TestCase name="bind_hole">
<Test name="float">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 910726a..6eb7082 100644
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -36135,30 +36135,6 @@
dEQP-GLES3.functional.attribute_location.bind_max_attributes.mat4x2
dEQP-GLES3.functional.attribute_location.bind_max_attributes.mat4x3
dEQP-GLES3.functional.attribute_location.bind_max_attributes.mat4x4
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_float
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond_float
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_inactive_float
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_vec2
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond_vec2
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_inactive_vec2
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_vec3
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond_vec3
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_inactive_vec3
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_vec4
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond_vec4
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_inactive_vec4
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_mat2
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_mat2_offset_1
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond_mat2
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_inactive_mat2
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_mat3
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_mat3_offset_1
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond_mat3
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_inactive_mat3
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_mat4
-dEQP-GLES3.functional.attribute_location.bind_aliasing.cond_mat4_offset_1
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond_mat4
-dEQP-GLES3.functional.attribute_location.bind_aliasing.max_inactive_mat4
dEQP-GLES3.functional.attribute_location.bind_hole.float
dEQP-GLES3.functional.attribute_location.bind_hole.vec2
dEQP-GLES3.functional.attribute_location.bind_hole.vec3
diff --git a/android/cts/master/src/gles3-driver-issues.txt b/android/cts/master/src/gles3-driver-issues.txt
new file mode 100644
index 0000000..7038ff9
--- /dev/null
+++ b/android/cts/master/src/gles3-driver-issues.txt
@@ -0,0 +1,2 @@
+# Bug 21495208
+dEQP-GLES3.functional.attribute_location.bind_aliasing.*
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index b39fd2e..3fd8ff7 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -431,6 +431,7 @@
MASTER_GLES3_COMMON_FILTERS = [
include("gles3-master.txt"),
exclude("gles3-hw-issues.txt"),
+ exclude("gles3-driver-issues.txt"),
exclude("gles3-test-issues.txt"),
exclude("gles3-spec-issues.txt")
]