Remove tests affected by NV/OES_viewport_array extension
Tests were not properly taking into account viewport clamping behavior
introduced by GL_NV/OES_viewport_array extensions.
Bug: 34349411
Change-Id: I3eae36359e6408191e0fbefb20cededec2a5bd39
Merged-In: I3d3c2e32d7dd96d1db960aa53dc18cc690187ec0
diff --git a/android/cts/master/com.drawelements.deqp.gles2.xml b/android/cts/master/com.drawelements.deqp.gles2.xml
index 1d946d4..2c3b05c 100644
--- a/android/cts/master/com.drawelements.deqp.gles2.xml
+++ b/android/cts/master/com.drawelements.deqp.gles2.xml
@@ -39763,12 +39763,6 @@
<Test name="viewport_getboolean">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="viewport_getinteger">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="viewport_getfloat">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
<Test name="scissor_box_getboolean">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 5e19de4..a29265e 100644
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -129660,15 +129660,6 @@
<Test name="viewport_getboolean">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="viewport_getinteger">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="viewport_getinteger64">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="viewport_getfloat">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
<Test name="scissor_box_getboolean">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
diff --git a/android/cts/master/gles2-master.txt b/android/cts/master/gles2-master.txt
index 2b6f7c7..590d338 100644
--- a/android/cts/master/gles2-master.txt
+++ b/android/cts/master/gles2-master.txt
@@ -12929,8 +12929,6 @@
dEQP-GLES2.functional.state_query.integers.front_face_mode_getinteger
dEQP-GLES2.functional.state_query.integers.front_face_mode_getfloat
dEQP-GLES2.functional.state_query.integers.viewport_getboolean
-dEQP-GLES2.functional.state_query.integers.viewport_getinteger
-dEQP-GLES2.functional.state_query.integers.viewport_getfloat
dEQP-GLES2.functional.state_query.integers.scissor_box_getboolean
dEQP-GLES2.functional.state_query.integers.scissor_box_getinteger
dEQP-GLES2.functional.state_query.integers.scissor_box_getfloat
diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 9980ae0..1208233 100644
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -39191,9 +39191,6 @@
dEQP-GLES3.functional.state_query.integers.front_face_mode_getinteger64
dEQP-GLES3.functional.state_query.integers.front_face_mode_getfloat
dEQP-GLES3.functional.state_query.integers.viewport_getboolean
-dEQP-GLES3.functional.state_query.integers.viewport_getinteger
-dEQP-GLES3.functional.state_query.integers.viewport_getinteger64
-dEQP-GLES3.functional.state_query.integers.viewport_getfloat
dEQP-GLES3.functional.state_query.integers.scissor_box_getboolean
dEQP-GLES3.functional.state_query.integers.scissor_box_getinteger
dEQP-GLES3.functional.state_query.integers.scissor_box_getinteger64
diff --git a/android/cts/master/src/gles2-test-issues.txt b/android/cts/master/src/gles2-test-issues.txt
index 8c9ea65..d892863 100644
--- a/android/cts/master/src/gles2-test-issues.txt
+++ b/android/cts/master/src/gles2-test-issues.txt
@@ -65,3 +65,7 @@
dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_rgba8888
+
+# Bug 34349411
+dEQP-GLES2.functional.state_query.integers.viewport_getfloat
+dEQP-GLES2.functional.state_query.integers.viewport_getinteger
diff --git a/android/cts/master/src/gles3-test-issues.txt b/android/cts/master/src/gles3-test-issues.txt
index 91a625e..b43a27e 100644
--- a/android/cts/master/src/gles3-test-issues.txt
+++ b/android/cts/master/src/gles3-test-issues.txt
@@ -171,3 +171,8 @@
dEQP-GLES3.functional.shaders.builtin_functions.precision.reflect.mediump_fragment.vec4
dEQP-GLES3.functional.shaders.builtin_functions.precision.reflect.highp_vertex.vec3
dEQP-GLES3.functional.shaders.builtin_functions.precision.reflect.highp_fragment.vec3
+
+# Bug 34349411
+dEQP-GLES3.functional.state_query.integers.viewport_getfloat
+dEQP-GLES3.functional.state_query.integers.viewport_getinteger
+dEQP-GLES3.functional.state_query.integers.viewport_getinteger64
