Remove few preprocessor corner cases affected by spec bug

Bug: 27126954
Change-Id: Ic652e6f297b444135aa89c47c899d689c2bc5008

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 449ff26..389b170 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -3223,18 +3223,6 @@
                                                <Test name="defined_macro_undef_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="define_defined_vertex">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="define_defined_fragment">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="define_defined_outside_if_vertex">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="define_defined_outside_if_fragment">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="defined_invalid_before_all_macros_replaced_vertex">
                                                        <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 8d410f1..2cd197f 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -960,10 +960,6 @@ dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_d
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_defined_test_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef_vertex
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef_fragment
-dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_vertex
-dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_fragment
-dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_outside_if_vertex
-dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_outside_if_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_invalid_before_all_macros_replaced_vertex
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_invalid_before_all_macros_replaced_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_3_vertex

diff --git a/android/cts/master/src/gles3-spec-issues.txt b/android/cts/master/src/gles3-spec-issues.txt
index 7efd102..ad1f008 100644 (file)
--- a/android/cts/master/src/gles3-spec-issues.txt
+++ b/android/cts/master/src/gles3-spec-issues.txt
@@ -519,3 +519,9 @@ dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_3
 # Khronos bug 14266, internal bug 22654014
 dEQP-GLES3.functional.negative_api.texture.compressedteximage3d_invalid_astc_target
 dEQP-GLES3.functional.negative_api.texture.texstorage3d_invalid_astc_target
+
+# Khronos bug 15567, internal bug 27126954
+dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_vertex
+dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_fragment
+dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_outside_if_vertex
+dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_outside_if_fragment