Enable default VAO attrib divisor test for resolved Khronos bug 13564.

Bug: 20154392
Change-Id: I46118adefb6f6f8e91c6660c2503c987343fc4c8

diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index 676ac214493db6f98d64fe1e752b031020266022..5ced36440e512dba6ed8845ef2e5cc185d3c77da 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -103996,6 +103996,11 @@
                                        </TestCase>
                                </TestSuite>
                        </TestSuite>
+                       <TestCase name="default_vertex_array_object">
+                               <Test name="vertex_attrib_divisor">
+                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                               </Test>
+                       </TestCase>
                </TestSuite>
        </TestSuite>
 </TestPackage>

diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index 805672d11436ba5ae48ecae6ee78def85541a395..8e4148b05c98b6eb0265c509229bbb3d793c6604 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -32150,3 +32150,4 @@ dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffe
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.17
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.18
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.19
+dEQP-GLES31.functional.default_vertex_array_object.vertex_attrib_divisor

diff --git a/android/cts/master/src/gles31-spec-issues.txt b/android/cts/master/src/gles31-spec-issues.txt
index f68ae468aaf98339287d202e7b93e05f932401cf..26a63ea91fc8d3acd00d0376476df538d3c5c853 100644 (file)
--- a/android/cts/master/src/gles31-spec-issues.txt
+++ b/android/cts/master/src/gles31-spec-issues.txt
@@ -1,5 +1,2 @@
-# Bug 13564
-dEQP-GLES31.functional.default_vertex_array_object.vertex_attrib_divisor
-
 # Khronos bugs 11207, 12408, internal bug 20699693
 dEQP-GLES31.functional.shaders.arrays_of_arrays.invalid.empty_declaration_without_var_name_*