Add fixed tests back to mustpass set.

Bug: 20340817
Bug: 20340818
Bug: 21725534
Bug: 22405868
Change-Id: I596d9c111ec06d9509b41fa8d40793b4813f4871

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 56fca32..58032fb 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -3795,6 +3795,18 @@
                                                <Test name="pragma_macro_exp_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
+                                               <Test name="pragma_unrecognized_debug_vertex">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <Test name="pragma_unrecognized_debug_fragment">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <Test name="pragma_unrecognized_token_vertex">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <Test name="pragma_unrecognized_token_fragment">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
                                        </TestCase>
                                        <TestCase name="extensions">
                                                <Test name="basic_vertex">
@@ -47319,6 +47331,9 @@
                                                <Test name="sampler3d_fixed_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
+                                               <Test name="sampler3d_float_vertex">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
                                                <Test name="sampler3d_float_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
@@ -92568,6 +92583,9 @@
                                        <Test name="texture_levels">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
+                                       <Test name="attachment_query_default_fbo">
+                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                       </Test>
                                        <Test name="attachment_query_empty_fbo">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
@@ -127669,6 +127687,9 @@
                                        <Test name="compressedtexsubimage2d_invalid_buffer_target">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
+                                       <Test name="teximage3d">
+                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                       </Test>
                                        <Test name="teximage3d_neg_level">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 4c6ef69..19d052f 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -1146,6 +1146,10 @@ dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_vertex
 dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_fragment
 dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_macro_exp_vertex
 dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_macro_exp_fragment
+dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_unrecognized_debug_vertex
+dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_unrecognized_debug_fragment
+dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_unrecognized_token_vertex
+dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_unrecognized_token_fragment
 dEQP-GLES3.functional.shaders.preprocessor.extensions.basic_vertex
 dEQP-GLES3.functional.shaders.preprocessor.extensions.basic_fragment
 dEQP-GLES3.functional.shaders.preprocessor.extensions.macro_exp_vertex
@@ -15451,6 +15455,7 @@ dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.usampler2d_
 dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.usampler2d_vec4_fragment
 dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler3d_fixed_vertex
 dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler3d_fixed_fragment
+dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler3d_float_vertex
 dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler3d_float_fragment
 dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.isampler3d_fragment
 dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.usampler3d_fragment
@@ -27854,6 +27859,7 @@ dEQP-GLES3.functional.fbo.api.invalid_texcube_attachments
 dEQP-GLES3.functional.fbo.api.invalid_rbo_attachments
 dEQP-GLES3.functional.fbo.api.attach_names
 dEQP-GLES3.functional.fbo.api.texture_levels
+dEQP-GLES3.functional.fbo.api.attachment_query_default_fbo
 dEQP-GLES3.functional.fbo.api.attachment_query_empty_fbo
 dEQP-GLES3.functional.fbo.api.attachment_query_tex2d
 dEQP-GLES3.functional.fbo.api.attachment_query_texcube
@@ -38640,6 +38646,7 @@ dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d_invalid_offse
 dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d_neg_width_height
 dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d_invalid_size
 dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d_invalid_buffer_target
+dEQP-GLES3.functional.negative_api.texture.teximage3d
 dEQP-GLES3.functional.negative_api.texture.teximage3d_neg_level
 dEQP-GLES3.functional.negative_api.texture.teximage3d_max_level
 dEQP-GLES3.functional.negative_api.texture.teximage3d_neg_width_height_depth

diff --git a/android/cts/master/src/gles3-test-issues.txt b/android/cts/master/src/gles3-test-issues.txt
index bb766bd..8b68757 100644 (file)
--- a/android/cts/master/src/gles3-test-issues.txt
+++ b/android/cts/master/src/gles3-test-issues.txt
@@ -53,12 +53,6 @@ dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.4
 # Bug 20092191
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.20
 
-# Bug 20340817
-dEQP-GLES3.functional.fbo.api.attachment_query_default_fbo
-
-# Bug 20340818
-dEQP-GLES3.functional.negative_api.texture.teximage3d
-
 # Bug 20699985
 dEQP-GLES3.functional.shaders.texture_functions.textureoffset.isampler3d_vertex
 
@@ -68,10 +62,6 @@ dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.usampler3d_
 # Bug 21620051
 dEQP-GLES3.functional.shaders.texture_functions.texture.sampler2darrayshadow_vertex
 
-# Bug 21725534
-dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_unrecognized_debug_*
-dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_unrecognized_token_*
-
 # Bug 21791303
 dEQP-GLES3.functional.uniform_api.random.23
 
@@ -97,9 +87,6 @@ dEQP-GLES3.functional.shaders.texture_functions.textureprojoffset.usampler3d_fra
 dEQP-GLES3.functional.shaders.builtin_functions.precision.acosh.highp_*
 dEQP-GLES3.functional.shaders.builtin_functions.precision.atanh.highp_*
 
-# Bug 22405868
-dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler3d_float_vertex
-
 # Bug 22628471
 dEQP-GLES3.functional.shaders.derivate.dfdx.*_float.*_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.*_float.*_highp