am 8914681e: Re-generate master mustpass

* commit '8914681e8a611121c915950909cad9157cae37e4':
  Re-generate master mustpass

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index ecb2e10..e7bef92 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -3193,6 +3193,36 @@
                                                <Test name="basic_2_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
+                                               <Test name="defined_macro_defined_test_vertex">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <Test name="defined_macro_defined_test_fragment">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <Test name="defined_macro_undef_vertex">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <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>
+                                               <Test name="defined_invalid_before_all_macros_replaced_fragment">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
                                                <Test name="basic_3_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 8c156f8..11a2697 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -956,6 +956,16 @@ dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_1_vertex
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_1_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2_vertex
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2_fragment
+dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_defined_test_vertex
+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
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_3_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_4_vertex