From 357f863531e173c34bd40b669b061ac987f9c01b Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Wed, 22 Mar 2017 11:00:11 +0100 Subject: [PATCH] Remove few compute_interop tests from GLES CTS 3.2.3.x Affects: dEQP-GLES31.functional.draw_indirect.compute_interop.large.*grid_1000x1000_drawcount_5000 Components: OpenGL VL-GL-CTS issue: 293 Change-Id: Ib76b3fa577bf672b512ec3b01968538bc3c4be81 --- .../data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-master.txt | 4 ---- .../data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-multisample.txt | 2 -- .../aosp_mustpass/3.2.3.x/src/gles31-multisample-test-issues.txt | 3 +++ .../mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-test-issues.txt | 6 ++++++ external/openglcts/scripts/build_mustpass.py | 4 +++- 5 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-multisample-test-issues.txt diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-master.txt index 89d56c5..4e89b7f 100644 --- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-master.txt +++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-master.txt @@ -7663,7 +7663,6 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_separate_g dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_separate_grid_100x100_drawcount_200 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_separate_grid_200x200_drawcount_800 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_separate_grid_500x500_drawcount_2500 -dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_separate_grid_1000x1000_drawcount_5000 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_grid_100x100_drawcount_1 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_grid_200x200_drawcount_1 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_grid_500x500_drawcount_1 @@ -7679,7 +7678,6 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_g dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_grid_100x100_drawcount_200 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_grid_200x200_drawcount_800 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_grid_500x500_drawcount_2500 -dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_grid_1000x1000_drawcount_5000 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 @@ -7695,7 +7693,6 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate 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 @@ -7711,7 +7708,6 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined 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/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-multisample.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-multisample.txt index 44d4428..970680d 100644 --- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-multisample.txt +++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles31-multisample.txt @@ -44,7 +44,6 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate 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 @@ -60,7 +59,6 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined 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/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-multisample-test-issues.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-multisample-test-issues.txt new file mode 100644 index 0000000..9202af2 --- /dev/null +++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-multisample-test-issues.txt @@ -0,0 +1,3 @@ +#VK-GL-CTS 293 +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_5000 diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-test-issues.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-test-issues.txt index 545ba85..11dcb59 100644 --- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-test-issues.txt +++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-test-issues.txt @@ -49,3 +49,9 @@ dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.lowp_compute. dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.mediump_compute.vec3 dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.mediump_compute.vec4 dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.highp_compute.vec3 + +#VK-GL-CTS 293 +dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_separate_grid_1000x1000_drawcount_5000 +dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawarrays_combined_grid_1000x1000_drawcount_5000 +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_5000 diff --git a/external/openglcts/scripts/build_mustpass.py b/external/openglcts/scripts/build_mustpass.py index f4c1040..e55d5b1 100644 --- a/external/openglcts/scripts/build_mustpass.py +++ b/external/openglcts/scripts/build_mustpass.py @@ -349,7 +349,9 @@ GLCTS_3_2_3_GLES31_PKG = Package(module = ES31CTS_MODULE, configurations = [ rotation = "unspecified", surfacewidth = "256", surfaceheight = "256", - filters = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-multisample.txt")]), + filters = [include("gles31-master.txt"), + include("gles31-multisample.txt"), + exclude("gles31-multisample-test-issues.txt")]), # Pixel format Configuration(name = "565-no-depth-no-stencil", -- 2.7.4