projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 7d64dca)
am ca60962c: Remove large draw_indirect.compute_interop tests
authorKalle Raita <kraita@google.com>
Thu, 24 Sep 2015 22:09:44 +0000 (22:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 22:09:44 +0000 (22:09 +0000)
* commit 'ca60962c06f071d7a40bade0771c5a60b8f18864':
  Remove large draw_indirect.compute_interop tests

android/cts/master/com.drawelements.deqp.gles31.xml patch | blob | history
android/cts/master/gles31-master.txt patch | blob | history
android/cts/master/gles31-multisample.txt patch | blob | history
android/cts/master/src/gles31-hw-issues.txt patch | blob | history

diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index e612ec7..78c5855 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -17977,18 +17977,6 @@
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="drawelements_separate_grid_1000x1000_drawcount_1">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="drawelements_separate_grid_1200x1200_drawcount_1">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="drawelements_separate_grid_1500x1500_drawcount_1">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="drawelements_separate_grid_100x100_drawcount_8">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
@@ -18001,18 +17989,6 @@
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="drawelements_separate_grid_1000x1000_drawcount_8">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="drawelements_separate_grid_1200x1200_drawcount_8">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="drawelements_separate_grid_1500x1500_drawcount_8">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="drawelements_separate_grid_100x100_drawcount_200">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
@@ -18025,10 +18001,6 @@
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="drawelements_separate_grid_1000x1000_drawcount_5000">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="drawelements_combined_grid_100x100_drawcount_1">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
@@ -18041,18 +18013,6 @@
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="drawelements_combined_grid_1000x1000_drawcount_1">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="drawelements_combined_grid_1200x1200_drawcount_1">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="drawelements_combined_grid_1500x1500_drawcount_1">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="drawelements_combined_grid_100x100_drawcount_8">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
@@ -18065,18 +18025,6 @@
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="drawelements_combined_grid_1000x1000_drawcount_8">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="drawelements_combined_grid_1200x1200_drawcount_8">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="drawelements_combined_grid_1500x1500_drawcount_8">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="drawelements_combined_grid_100x100_drawcount_200">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
@@ -18089,10 +18037,6 @@
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="drawelements_combined_grid_1000x1000_drawcount_5000">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                        </TestCase>
                                </TestSuite>
                                <TestCase name="random">
diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index 06a98fe..b5dc8e3 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -5498,35 +5498,21 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_g
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_100x100_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_200x200_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_500x500_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1200x1200_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1500x1500_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_100x100_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_200x200_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_500x500_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1200x1200_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1500x1500_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_100x100_drawcount_200
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_200x200_drawcount_800
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_500x500_drawcount_2500
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_5000
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_100x100_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_200x200_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_500x500_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1200x1200_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1500x1500_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_100x100_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_200x200_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_500x500_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1200x1200_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1500x1500_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_100x100_drawcount_200
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_200x200_drawcount_800
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_500x500_drawcount_2500
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_5000
 dEQP-GLES31.functional.draw_indirect.random.0
 dEQP-GLES31.functional.draw_indirect.random.2
 dEQP-GLES31.functional.draw_indirect.random.3
diff --git a/android/cts/master/gles31-multisample.txt b/android/cts/master/gles31-multisample.txt
index ed5f795..73a0e62 100644 (file)
--- a/android/cts/master/gles31-multisample.txt
+++ b/android/cts/master/gles31-multisample.txt
@@ -103,35 +103,21 @@ dEQP-GLES31.functional.shaders.helper_invocation.derivate.wide_points_max_sample
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_100x100_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_200x200_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_500x500_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1200x1200_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1500x1500_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_100x100_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_200x200_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_500x500_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1200x1200_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1500x1500_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_100x100_drawcount_200
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_200x200_drawcount_800
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_500x500_drawcount_2500
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_5000
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_100x100_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_200x200_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_500x500_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1200x1200_drawcount_1
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1500x1500_drawcount_1
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_100x100_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_200x200_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_500x500_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1200x1200_drawcount_8
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1500x1500_drawcount_8
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_100x100_drawcount_200
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_200x200_drawcount_800
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_500x500_drawcount_2500
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_5000
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_depth
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_stencil
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_tests_depth
diff --git a/android/cts/master/src/gles31-hw-issues.txt b/android/cts/master/src/gles31-hw-issues.txt
index b2030f7..ce0bebc 100644 (file)
--- a/android/cts/master/src/gles31-hw-issues.txt
+++ b/android/cts/master/src/gles31-hw-issues.txt
@@ -73,3 +73,19 @@ dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_smaller
+
+# Bug 23288315
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_1
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1200x1200_drawcount_1
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1500x1500_drawcount_1
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_8
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1200x1200_drawcount_8
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1500x1500_drawcount_8
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_5000
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_1
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1200x1200_drawcount_1
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1500x1500_drawcount_1
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_8
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1200x1200_drawcount_8
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1500x1500_drawcount_8
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_5000
Domain: Graphics System / GL;