Add mipmap.2d.projected tests back to mustpass

Bug: 28200359
Change-Id: I5c96df13ba7b0a31bed63864336b710de66295db

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 76ef6b4..712c5ba 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -70406,6 +70406,44 @@
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
                                                </TestCase>
+                                               <TestCase name="projected">
+                                                       <Test name="nearest_nearest_clamp">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="nearest_nearest_repeat">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="nearest_nearest_mirror">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="linear_nearest_clamp">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="linear_nearest_repeat">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="linear_nearest_mirror">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="nearest_linear_clamp">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="nearest_linear_repeat">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="nearest_linear_mirror">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="linear_linear_clamp">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="linear_linear_repeat">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                                       <Test name="linear_linear_mirror">
+                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                                       </Test>
+                                               </TestCase>
                                                <TestCase name="bias">
                                                        <Test name="nearest_nearest">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 6b535ab..7173d64 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -22316,6 +22316,18 @@ dEQP-GLES3.functional.texture.mipmap.2d.affine.nearest_linear_mirror
 dEQP-GLES3.functional.texture.mipmap.2d.affine.linear_linear_clamp
 dEQP-GLES3.functional.texture.mipmap.2d.affine.linear_linear_repeat
 dEQP-GLES3.functional.texture.mipmap.2d.affine.linear_linear_mirror
+dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_clamp
+dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_repeat
+dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_mirror
+dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_clamp
+dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_repeat
+dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_mirror
+dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_clamp
+dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_repeat
+dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_mirror
+dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_clamp
+dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_repeat
+dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_mirror
 dEQP-GLES3.functional.texture.mipmap.2d.bias.nearest_nearest
 dEQP-GLES3.functional.texture.mipmap.2d.bias.linear_nearest
 dEQP-GLES3.functional.texture.mipmap.2d.bias.nearest_linear

diff --git a/android/cts/master/src/gles3-hw-issues.txt b/android/cts/master/src/gles3-hw-issues.txt
index c8e649e..a6f753b 100644 (file)
--- a/android/cts/master/src/gles3-hw-issues.txt
+++ b/android/cts/master/src/gles3-hw-issues.txt
@@ -883,6 +883,3 @@ dEQP-GLES3.functional.texture.filtering.3d.formats.rgba16f_linear_mipmap_linear
 # Bug 22920759
 dEQP-GLES3.functional.texture.mipmap.cube.projected.nearest_linear
 dEQP-GLES3.functional.texture.mipmap.cube.max_level.nearest_nearest
-
-# Bug 28200359
-dEQP-GLES3.functional.texture.mipmap.2d.projected.*