From a1c61d9cd55b15ffdf4f0a5367c7c01ba3cc8114 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Wed, 5 Apr 2017 18:50:08 +0200 Subject: [PATCH] Exclude tests that require non-default context Components: OpenGL Affects: KHR-GLES32.context_flags.* KHR-GLES32.robust.* VK-GL-CTS issue: 354 Change-Id: I3103afa5d8a284919b5edb9e5fa2113e0236be86 --- .../khronos_mustpass/3.2.3.x/gles32-khr-master.txt | 13 ------ .../3.2.3.x/src/gles32-khr-test-issues.txt | 3 ++ external/openglcts/scripts/build_mustpass.py | 50 +++++++++++++++++++++- 3 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles32-khr-test-issues.txt diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/gles32-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/gles32-khr-master.txt index 55fbfea..96e023f 100644 --- a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/gles32-khr-master.txt +++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/gles32-khr-master.txt @@ -303,16 +303,3 @@ KHR-GLES32.core.draw_buffers_indexed.set_get KHR-GLES32.core.draw_buffers_indexed.color_masks KHR-GLES32.core.draw_buffers_indexed.blending KHR-GLES32.core.draw_buffers_indexed.negative -KHR-GLES32.context_flags.context_flags.noFlagsSetCase -KHR-GLES32.context_flags.context_flags.debugFlagSetCase -KHR-GLES32.context_flags.context_flags.robustFlagSetCase -KHR-GLES32.context_flags.context_flags.allFlagsSetCase -KHR-GLES32.robust.robustness.noResetNotification -KHR-GLES32.robust.robustness.loseContextOnReset -KHR-GLES32.robust.robustness.getnuniform -KHR-GLES32.robust.robustness.readnpixels -KHR-GLES32.robust.robust_buffer_access_behavior.vertex_buffer_objects -KHR-GLES32.robust.robust_buffer_access_behavior.texel_fetch -KHR-GLES32.robust.robust_buffer_access_behavior.image_load_store -KHR-GLES32.robust.robust_buffer_access_behavior.storage_buffer -KHR-GLES32.robust.robust_buffer_access_behavior.uniform_buffer diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles32-khr-test-issues.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles32-khr-test-issues.txt new file mode 100644 index 0000000..9f7b69a --- /dev/null +++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.3.x/src/gles32-khr-test-issues.txt @@ -0,0 +1,3 @@ +#VK-GL-CTS 354i +KHR-GLES32.context_flags.* +KHR-GLES32.robust.* diff --git a/external/openglcts/scripts/build_mustpass.py b/external/openglcts/scripts/build_mustpass.py index bc5d331..007e434 100644 --- a/external/openglcts/scripts/build_mustpass.py +++ b/external/openglcts/scripts/build_mustpass.py @@ -366,6 +366,52 @@ GLCTS_3_2_3_GLES31_PKG = Package(module = ES31CTS_MODULE, configurations = [ filters = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-pixelformat.txt")]), ]) +GLCTS_3_2_3_GLES32_KHR_COMMON_FILTERS = [ + include("gles32-khr-master.txt"), + exclude("gles32-khr-test-issues.txt") + ] + +GLCTS_3_2_3_GLES32_KHR_PKG_1CFG = Package(module = ES32KHR_MODULE, configurations = [ + # Master + Configuration(name = "khr-master", + surfacewidth = "64", + surfaceheight = "64", + baseseed = "1", + filters = GLCTS_3_2_3_GLES32_KHR_COMMON_FILTERS), + Configuration(name = "khr-master", + surfacewidth = "113", + surfaceheight = "47", + baseseed = "2", + filters = GLCTS_3_2_3_GLES32_KHR_COMMON_FILTERS), + Configuration(name = "khr-master", + surfacewidth = "64", + surfaceheight = "-1", + baseseed = "3", + fboconfig = "rgba8888d24s8", + filters = GLCTS_3_2_3_GLES32_KHR_COMMON_FILTERS), + Configuration(name = "khr-master", + surfacewidth = "-1", + surfaceheight = "64", + baseseed = "3", + fboconfig = "rgba8888d24s8", + filters = GLCTS_3_2_3_GLES32_KHR_COMMON_FILTERS), + ]) + +GLCTS_3_2_3_GLES32_KHR_PKG_N1CFG = Package(module = ES32KHR_MODULE, useforfirsteglconfig = False, configurations = [ + # Master + Configuration(name = "khr-master", + surfacewidth = "64", + surfaceheight = "64", + baseseed = "1", + filters = GLCTS_3_2_3_GLES32_KHR_COMMON_FILTERS), + Configuration(name = "khr-master", + surfacewidth = "113", + surfaceheight = "47", + baseseed = "2", + filters = GLCTS_3_2_3_GLES32_KHR_COMMON_FILTERS), + ]) + + # master MASTER_EGL_COMMON_FILTERS = [include("egl-master.txt"), exclude("egl-test-issues.txt"), @@ -834,8 +880,8 @@ MUSTPASS_LISTS = [ GLCTS_GLES31_GTF_PKG_1CFG, GLCTS_GLES31_KHR_PKG_N1CFG, GLCTS_GLES31_GTF_PKG_N1CFG, - GLCTS_GLES32_KHR_PKG_1CFG, - GLCTS_GLES32_KHR_PKG_N1CFG, + GLCTS_3_2_3_GLES32_KHR_PKG_1CFG, + GLCTS_3_2_3_GLES32_KHR_PKG_N1CFG, ]), Mustpass(project = CTS_AOSP_MP_ES_PROJECT, version = "3.2.3.x", isCurrent=True, -- 2.7.4