resolve merge conflicts of cfeb3c0 to nyc-dev
Change-Id: I7172a107debe1356601a60154234660d8f8b3c71
diff --git a/android/cts/master/com.drawelements.deqp.gles2.xml b/android/cts/master/com.drawelements.deqp.gles2.xml
index 5b2ebcf..1d946d4 100644
--- a/android/cts/master/com.drawelements.deqp.gles2.xml
+++ b/android/cts/master/com.drawelements.deqp.gles2.xml
@@ -26600,15 +26600,6 @@
</TestCase>
</TestSuite>
<TestCase name="wrap">
- <Test name="clamp_clamp_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="clamp_clamp_nearest_pot_rgb888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="clamp_clamp_nearest_pot_l8">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
<Test name="clamp_clamp_nearest_npot_rgb888">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
@@ -26639,42 +26630,12 @@
<Test name="clamp_clamp_linear_npot_l8">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="clamp_repeat_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="clamp_mirror_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
<Test name="clamp_mirror_linear_pot_rgba8888">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="repeat_clamp_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="repeat_repeat_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="repeat_mirror_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="repeat_mirror_nearest_pot_rgb888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="repeat_mirror_nearest_pot_l8">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="mirror_clamp_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
<Test name="mirror_clamp_linear_pot_rgba8888">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="mirror_repeat_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="mirror_mirror_nearest_pot_rgba8888">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
<Test name="mirror_mirror_linear_pot_rgba8888">
<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 8bfa089..2b6f7c7 100644
--- a/android/cts/master/gles2-master.txt
+++ b/android/cts/master/gles2-master.txt
@@ -8674,9 +8674,6 @@
dEQP-GLES2.functional.texture.size.cube.512x512_rgb888_mipmap
dEQP-GLES2.functional.texture.size.cube.512x512_rgba8888
dEQP-GLES2.functional.texture.size.cube.512x512_rgba8888_mipmap
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_l8
dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgb888
dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_l8
dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_pot_rgba8888
@@ -8687,18 +8684,8 @@
dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_npot_rgb888
dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_npot_rgba4444
dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_npot_l8
-dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.clamp_mirror_linear_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_l8
-dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.mirror_clamp_linear_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_rgba8888
dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_clamp_etc1
dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_nearest_linear_clamp_etc1
diff --git a/android/cts/master/src/gles2-test-issues.txt b/android/cts/master/src/gles2-test-issues.txt
index fce6178..8c9ea65 100644
--- a/android/cts/master/src/gles2-test-issues.txt
+++ b/android/cts/master/src/gles2-test-issues.txt
@@ -1,6 +1,7 @@
# Bug 21526557
dEQP-GLES2.functional.texture.size.cube.256x256_rgba4444
dEQP-GLES2.functional.texture.size.cube.512x512_rgba4444
+
# Bug 22665757
dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.rgb16f
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb16f
@@ -49,3 +50,18 @@
dEQP-GLES2.functional.texture.wrap.mirror_clamp_linear_pot_etc1
dEQP-GLES2.functional.texture.wrap.mirror_repeat_linear_pot_etc1
dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_etc1
+
+# Bug 26542781
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgb888
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_l8
+dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgb888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_l8
+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