Remove array layout location tests due to spec issue.

Bug: 27834911
Change-Id: Ibd8fb8f28ae20de1877c13dca35988d0f5cd5e5a

diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index 0cc7690..32f3626 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -62954,21 +62954,12 @@
                                                                        <Test name="var">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                        <Test name="var_struct">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_struct_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                        <Test name="var_array">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_array_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                </TestCase>
                                                        </TestSuite>
                                                        <TestSuite name="patch_in">
@@ -63036,21 +63027,12 @@
                                                                        <Test name="var">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                        <Test name="var_struct">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_struct_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                        <Test name="var_array">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_array_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                </TestCase>
                                                        </TestSuite>
                                                </TestSuite>
@@ -65062,21 +65044,12 @@
                                                                        <Test name="var">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                        <Test name="var_struct">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_struct_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                        <Test name="var_array">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_array_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                </TestCase>
                                                        </TestSuite>
                                                        <TestSuite name="patch_out">
@@ -65144,21 +65117,12 @@
                                                                        <Test name="var">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                        <Test name="var_struct">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_struct_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                        <Test name="var_array">
                                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        </Test>
-                                                                       <Test name="var_array_explicit_location">
-                                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                                       </Test>
                                                                </TestCase>
                                                        </TestSuite>
                                                </TestSuite>

diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index 6f30095..0448060 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -19633,11 +19633,8 @@ dEQP-GLES31.functional.program_interface_query.program_input.location.interface_
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.unnamed_block.var_array
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.unnamed_block.var_array_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var
-dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var_struct
-dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var_struct_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var_array
-dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var_array_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.named_block.var
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.named_block.var_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.named_block.var_struct
@@ -19657,11 +19654,8 @@ dEQP-GLES31.functional.program_interface_query.program_input.location.interface_
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.unnamed_block.var_array
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.unnamed_block.var_array_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var
-dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var_struct
-dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var_struct_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var_array
-dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var_array_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_input.name_length.vertex_fragment.var
 dEQP-GLES31.functional.program_interface_query.program_input.name_length.separable_vertex.var
 dEQP-GLES31.functional.program_interface_query.program_input.name_length.separable_fragment.var
@@ -20241,11 +20235,8 @@ dEQP-GLES31.functional.program_interface_query.program_output.location.interface
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.unnamed_block.var_array
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.unnamed_block.var_array_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var
-dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var_struct
-dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var_struct_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var_array
-dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var_array_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.named_block.var
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.named_block.var_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.named_block.var_struct
@@ -20265,11 +20256,8 @@ dEQP-GLES31.functional.program_interface_query.program_output.location.interface
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.unnamed_block.var_array
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.unnamed_block.var_array_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var
-dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var_struct
-dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var_struct_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var_array
-dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var_array_explicit_location
 dEQP-GLES31.functional.program_interface_query.program_output.name_length.vertex_fragment.var
 dEQP-GLES31.functional.program_interface_query.program_output.name_length.vertex_fragment.var_array
 dEQP-GLES31.functional.program_interface_query.program_output.name_length.separable_vertex.var

diff --git a/android/cts/master/src/gles31-spec-issues.txt b/android/cts/master/src/gles31-spec-issues.txt
index 2911553..91591fb 100644 (file)
--- a/android/cts/master/src/gles31-spec-issues.txt
+++ b/android/cts/master/src/gles31-spec-issues.txt
@@ -7,3 +7,18 @@ dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_int_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_uint_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_uint_stencil
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_unorm_depth_uint_stencil_sample_stencil
+
+# Khronos bug 15678, internal 27834911
+dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var_array_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.out.block_array.var_struct_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var_array_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_output.location.interface_blocks.patch_out.block_array.var_struct_explicit_location
+
+dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var_array_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.in.block_array.var_struct_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var_array_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var_explicit_location
+dEQP-GLES31.functional.program_interface_query.program_input.location.interface_blocks.patch_in.block_array.var_struct_explicit_location