From bbd2ac6ac48c016f2247ae004cde5deb84902db8 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Fri, 1 Jun 2018 12:30:10 +0200 Subject: [PATCH] Exclude texture_view.view_classes Exclude KHR-GL*.texture_view.view_classes tests as per approved waiver VK-GL-CTS 1190 Components: OpenGL Affects: mustpass VK-GL-CTS issue 1141, 1190 Change-Id: I593e122b7af7cd4cd96e98400c0a876321803f78 --- .../mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt | 1 - .../mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt | 1 - .../mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt | 1 - .../mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt | 1 - .../mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt | 1 - .../gl/khronos_mustpass/4.6.0.x/src/gl40-waivers.txt | 0 .../gl/khronos_mustpass/4.6.0.x/src/gl41-waivers.txt | 0 .../gl/khronos_mustpass/4.6.0.x/src/gl42-waivers.txt | 2 ++ .../gl/khronos_mustpass/4.6.0.x/src/gl43-waivers.txt | 2 ++ .../gl/khronos_mustpass/4.6.0.x/src/gl44-waivers.txt | 2 ++ .../gl/khronos_mustpass/4.6.0.x/src/gl45-waivers.txt | 2 ++ .../gl/khronos_mustpass/4.6.0.x/src/gl46-waivers.txt | 2 ++ external/openglcts/scripts/build_mustpass.py | 14 +++++++------- 13 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl40-waivers.txt create mode 100644 external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl41-waivers.txt create mode 100644 external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl42-waivers.txt create mode 100644 external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl43-waivers.txt create mode 100644 external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl44-waivers.txt create mode 100644 external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl45-waivers.txt create mode 100644 external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl46-waivers.txt diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt index d019402..9aad987 100644 --- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt @@ -3586,7 +3586,6 @@ KHR-GL42.shading_language_420pack.built_in_assignment KHR-GL42.texture_view.gettexparameter KHR-GL42.texture_view.errors KHR-GL42.texture_view.view_sampling -KHR-GL42.texture_view.view_classes KHR-GL42.texture_view.coherency KHR-GL42.texture_view.base_and_max_levels KHR-GL42.texture_view.reference_counting diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt index 43d6968..047bea1 100644 --- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt @@ -3586,7 +3586,6 @@ KHR-GL43.shading_language_420pack.built_in_assignment KHR-GL43.texture_view.gettexparameter KHR-GL43.texture_view.errors KHR-GL43.texture_view.view_sampling -KHR-GL43.texture_view.view_classes KHR-GL43.texture_view.coherency KHR-GL43.texture_view.base_and_max_levels KHR-GL43.texture_view.reference_counting diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt index 3d6c095..c094c0e 100644 --- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt @@ -3586,7 +3586,6 @@ KHR-GL44.shading_language_420pack.built_in_assignment KHR-GL44.texture_view.gettexparameter KHR-GL44.texture_view.errors KHR-GL44.texture_view.view_sampling -KHR-GL44.texture_view.view_classes KHR-GL44.texture_view.coherency KHR-GL44.texture_view.base_and_max_levels KHR-GL44.texture_view.reference_counting diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt index 3d9bb6b..c51b731 100644 --- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt @@ -3587,7 +3587,6 @@ KHR-GL45.shading_language_420pack.built_in_assignment KHR-GL45.texture_view.gettexparameter KHR-GL45.texture_view.errors KHR-GL45.texture_view.view_sampling -KHR-GL45.texture_view.view_classes KHR-GL45.texture_view.coherency KHR-GL45.texture_view.base_and_max_levels KHR-GL45.texture_view.reference_counting diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt index 1a25461..575ef63 100644 --- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt @@ -3587,7 +3587,6 @@ KHR-GL46.shading_language_420pack.built_in_assignment KHR-GL46.texture_view.gettexparameter KHR-GL46.texture_view.errors KHR-GL46.texture_view.view_sampling -KHR-GL46.texture_view.view_classes KHR-GL46.texture_view.coherency KHR-GL46.texture_view.base_and_max_levels KHR-GL46.texture_view.reference_counting diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl40-waivers.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl40-waivers.txt new file mode 100644 index 0000000..e69de29 diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl41-waivers.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl41-waivers.txt new file mode 100644 index 0000000..e69de29 diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl42-waivers.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl42-waivers.txt new file mode 100644 index 0000000..b3399a7 --- /dev/null +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl42-waivers.txt @@ -0,0 +1,2 @@ +#VK-GL-CTS issue 1141, 1190 +KHR-GL42.texture_view.view_classes diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl43-waivers.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl43-waivers.txt new file mode 100644 index 0000000..4e2d920 --- /dev/null +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl43-waivers.txt @@ -0,0 +1,2 @@ +#VK-GL-CTS issue 1141, 1190 +KHR-GL43.texture_view.view_classes diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl44-waivers.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl44-waivers.txt new file mode 100644 index 0000000..8a75c26 --- /dev/null +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl44-waivers.txt @@ -0,0 +1,2 @@ +#VK-GL-CTS issue 1141, 1190 +KHR-GL44.texture_view.view_classes diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl45-waivers.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl45-waivers.txt new file mode 100644 index 0000000..c1ec455 --- /dev/null +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl45-waivers.txt @@ -0,0 +1,2 @@ +#VK-GL-CTS issue 1141, 1190 +KHR-GL45.texture_view.view_classes diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl46-waivers.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl46-waivers.txt new file mode 100644 index 0000000..0fb5f82 --- /dev/null +++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl46-waivers.txt @@ -0,0 +1,2 @@ +#VK-GL-CTS issue 1141, 1190 +KHR-GL46.texture_view.view_classes diff --git a/external/openglcts/scripts/build_mustpass.py b/external/openglcts/scripts/build_mustpass.py index 0e9fee9..606a102 100644 --- a/external/openglcts/scripts/build_mustpass.py +++ b/external/openglcts/scripts/build_mustpass.py @@ -988,13 +988,13 @@ GL_CTS_KHR_MP_NOCTX_DEVICE_DIR = "gl_cts/data/mustpass/gl/khronos_mustpass_noct GL_CTS_NOCTX_PROJECT = Project(name = "Khronos Mustpass GL NoContext", path = GL_CTS_KHR_MP_NOCTX_DATA_DIR, incpath = GL_CTS_MP_INC_DIR, devicepath = GL_CTS_KHR_MP_NOCTX_DEVICE_DIR, copyright = COPYRIGHT_DECLARATION) GL_MODULES = OrderedDict([ - ('KHR-GL46', ['master', [include('gl46-master.txt'), exclude('gl46-test-issues.txt')]]), - ('KHR-GL45', ['master', [include('gl45-master.txt'), exclude('gl45-test-issues.txt')]]), - ('KHR-GL44', ['master', [include('gl44-master.txt'), exclude('gl44-test-issues.txt')]]), - ('KHR-GL43', ['master', [include('gl43-master.txt'), exclude('gl43-test-issues.txt')]]), - ('KHR-GL42', ['master', [include('gl42-master.txt'), exclude('gl42-test-issues.txt')]]), - ('KHR-GL41', ['master', [include('gl41-master.txt'), exclude('gl41-test-issues.txt')]]), - ('KHR-GL40', ['master', [include('gl40-master.txt'), exclude('gl40-test-issues.txt')]]), + ('KHR-GL46', ['master', [include('gl46-master.txt'), exclude('gl46-test-issues.txt'), exclude('gl46-waivers.txt')]]), + ('KHR-GL45', ['master', [include('gl45-master.txt'), exclude('gl45-test-issues.txt'), exclude('gl45-waivers.txt')]]), + ('KHR-GL44', ['master', [include('gl44-master.txt'), exclude('gl44-test-issues.txt'), exclude('gl44-waivers.txt')]]), + ('KHR-GL43', ['master', [include('gl43-master.txt'), exclude('gl43-test-issues.txt'), exclude('gl43-waivers.txt')]]), + ('KHR-GL42', ['master', [include('gl42-master.txt'), exclude('gl42-test-issues.txt'), exclude('gl42-waivers.txt')]]), + ('KHR-GL41', ['master', [include('gl41-master.txt'), exclude('gl41-test-issues.txt'), exclude('gl41-waivers.txt')]]), + ('KHR-GL40', ['master', [include('gl40-master.txt'), exclude('gl40-test-issues.txt'), exclude('gl40-waivers.txt')]]), ('KHR-GL33', ['master', [include('gl33-master.txt')]]), ('KHR-GL32', ['master', [include('gl32-master.txt')]]), ('KHR-GL31', ['master', [include('gl31-master.txt')]]), -- 2.7.4