gitlab-ci: build RADV in meson-testing

This requires to bump LLVM to 8 because it's the minimum supported
version by RADV.

Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>

6 files changed, 81 insertions, 318 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22492727872..4db40a34a49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -229,7 +229,7 @@ meson-testing:
     GALLIUM_ST: >
       -D dri3=true
     GALLIUM_DRIVERS: "swrast"
-    LLVM_VERSION: "7"
+    VULKAN_DRIVERS: amd
     BUILDTYPE: "debugoptimized"
   script:
     - .gitlab-ci/meson-build.sh
diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 6160e8b01f3..1a717afd03a 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -40,6 +40,7 @@ apt-get install -y --no-remove \
       libxkbcommon-dev \
       libxrender1 \
       libxrender-dev \
+      libllvm8 \
       meson \
       patch \
       pkg-config \
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 206c63e0766..da877590de1 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -40,6 +40,7 @@ apt-get install -y --no-remove \
       libxkbcommon-dev \
       libxrender1 \
       libxrender-dev \
+      libllvm8 \
       meson \
       patch \
       pkg-config \
diff --git a/.gitlab-ci/piglit/glslparser.txt b/.gitlab-ci/piglit/glslparser.txt
index 68cc92135f0..6b89b293e9b 100644
--- a/.gitlab-ci/piglit/glslparser.txt
+++ b/.gitlab-ci/piglit/glslparser.txt
@@ -148,7 +148,6 @@ spec/amd_conservative_depth/preprocessor/disabled-undefined-core.geom: skip
 spec/amd_conservative_depth/preprocessor/disabled-undefined-core.tesc: skip
 spec/amd_conservative_depth/preprocessor/disabled-undefined-core.tese: skip
 spec/amd_conservative_depth/preprocessor/disabled-undefined-core.vert: skip
-spec/amd_conservative_depth/preprocessor/enabled-core.comp: skip
 spec/amd_conservative_depth/preprocessor/enabled-core.tesc: skip
 spec/amd_conservative_depth/preprocessor/enabled-core.tese: skip
 spec/amd_shader_stencil_export/preprocessor/disabled-defined-compat.frag: skip
@@ -167,7 +166,6 @@ spec/amd_shader_stencil_export/preprocessor/disabled-undefined-core.geom: skip
 spec/amd_shader_stencil_export/preprocessor/disabled-undefined-core.tesc: skip
 spec/amd_shader_stencil_export/preprocessor/disabled-undefined-core.tese: skip
 spec/amd_shader_stencil_export/preprocessor/disabled-undefined-core.vert: skip
-spec/amd_shader_stencil_export/preprocessor/enabled-core.comp: skip
 spec/amd_shader_stencil_export/preprocessor/enabled-core.tesc: skip
 spec/amd_shader_stencil_export/preprocessor/enabled-core.tese: skip
 spec/amd_shader_trinary_minmax/preprocessor/disabled-defined-compat.frag: skip
@@ -186,7 +184,6 @@ spec/amd_shader_trinary_minmax/preprocessor/disabled-undefined-core.geom: skip
 spec/amd_shader_trinary_minmax/preprocessor/disabled-undefined-core.tesc: skip
 spec/amd_shader_trinary_minmax/preprocessor/disabled-undefined-core.tese: skip
 spec/amd_shader_trinary_minmax/preprocessor/disabled-undefined-core.vert: skip
-spec/amd_shader_trinary_minmax/preprocessor/enabled-core.comp: skip
 spec/amd_shader_trinary_minmax/preprocessor/enabled-core.tesc: skip
 spec/amd_shader_trinary_minmax/preprocessor/enabled-core.tese: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-defined-core.comp: skip
@@ -203,7 +200,6 @@ spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.tese: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.vert: skip
 spec/amd_vertex_shader_layer/preprocessor/enabled-compat.frag: skip
 spec/amd_vertex_shader_layer/preprocessor/enabled-compat.vert: skip
-spec/amd_vertex_shader_layer/preprocessor/enabled-core.comp: skip
 spec/amd_vertex_shader_layer/preprocessor/enabled-core.tesc: skip
 spec/amd_vertex_shader_layer/preprocessor/enabled-core.tese: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.comp: skip
@@ -220,7 +216,6 @@ spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-core.tese:
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-core.vert: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/enabled-compat.frag: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/enabled-compat.vert: skip
-spec/amd_vertex_shader_viewport_index/preprocessor/enabled-core.comp: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/enabled-core.tesc: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/enabled-core.tese: skip
 spec/arb_arrays_of_arrays/compiler/glsl-4.00-basic-types.vert: skip
@@ -242,7 +237,6 @@ spec/arb_arrays_of_arrays/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_arrays_of_arrays/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_arrays_of_arrays/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_arrays_of_arrays/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_arrays_of_arrays/preprocessor/enabled-core.comp: skip
 spec/arb_arrays_of_arrays/preprocessor/enabled-core.tesc: skip
 spec/arb_arrays_of_arrays/preprocessor/enabled-core.tese: skip
 spec/arb_bindless_texture/compiler/images/arith-bound-image.frag: skip
@@ -308,37 +302,31 @@ spec/arb_bindless_texture/compiler/samplers/struct-inside-uniform-block.frag: sk
 spec/arb_bindless_texture/compiler/samplers/temporary.vert: skip
 spec/arb_bindless_texture/compiler/samplers/uniform-block-initializer.frag: skip
 spec/arb_compute_shader/compiler/barrier.comp: skip
-spec/arb_compute_shader/compiler/default_local_size.comp: skip
-spec/arb_compute_shader/compiler/do_nothing.comp: skip
-spec/arb_compute_shader/compiler/gl_workgroupsize_before_layout.comp: skip
-spec/arb_compute_shader/compiler/gl_workgroupsize_matches_layout.comp: skip
-spec/arb_compute_shader/compiler/gl_workgroupsize_without_layout.comp: skip
 spec/arb_compute_shader/compiler/groupmemorybarrier.comp: skip
 spec/arb_compute_shader/compiler/memorybarrieratomiccounter.comp: skip
 spec/arb_compute_shader/compiler/memorybarrierbuffer.comp: skip
 spec/arb_compute_shader/compiler/memorybarrierimage.comp: skip
 spec/arb_compute_shader/compiler/memorybarriershared.comp: skip
-spec/arb_compute_shader/compiler/mismatched_local_size.comp: skip
-spec/arb_compute_shader/compiler/negative_local_size.comp: skip
-spec/arb_compute_shader/compiler/no_user_defined_in.comp: skip
-spec/arb_compute_shader/compiler/no_user_defined_out.comp: skip
 spec/arb_compute_shader/compiler/shared-atomics.comp: skip
 spec/arb_compute_shader/compiler/shared-variables.comp: skip
-spec/arb_compute_shader/compiler/zero_local_size.comp: skip
+spec/arb_compute_shader/preprocessor/disabled-defined-compat.frag: skip
+spec/arb_compute_shader/preprocessor/disabled-defined-compat.vert: skip
 spec/arb_compute_shader/preprocessor/disabled-defined-core.comp: skip
+spec/arb_compute_shader/preprocessor/disabled-defined-core.frag: skip
+spec/arb_compute_shader/preprocessor/disabled-defined-core.geom: skip
 spec/arb_compute_shader/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_compute_shader/preprocessor/disabled-defined-core.tese: skip
+spec/arb_compute_shader/preprocessor/disabled-defined-core.vert: skip
+spec/arb_compute_shader/preprocessor/disabled-undefined-compat.frag: skip
+spec/arb_compute_shader/preprocessor/disabled-undefined-compat.vert: skip
 spec/arb_compute_shader/preprocessor/disabled-undefined-core.comp: skip
+spec/arb_compute_shader/preprocessor/disabled-undefined-core.frag: skip
+spec/arb_compute_shader/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_compute_shader/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_compute_shader/preprocessor/disabled-undefined-core.tese: skip
-spec/arb_compute_shader/preprocessor/enabled-compat.frag: skip
-spec/arb_compute_shader/preprocessor/enabled-compat.vert: skip
-spec/arb_compute_shader/preprocessor/enabled-core.comp: skip
-spec/arb_compute_shader/preprocessor/enabled-core.frag: skip
-spec/arb_compute_shader/preprocessor/enabled-core.geom: skip
+spec/arb_compute_shader/preprocessor/disabled-undefined-core.vert: skip
 spec/arb_compute_shader/preprocessor/enabled-core.tesc: skip
 spec/arb_compute_shader/preprocessor/enabled-core.tese: skip
-spec/arb_compute_shader/preprocessor/enabled-core.vert: skip
 spec/arb_compute_variable_group_size/compiler/do_nothing.comp: skip
 spec/arb_compute_variable_group_size/compiler/gl_localgroupsizearb_illegal_use.comp: skip
 spec/arb_compute_variable_group_size/compiler/gl_localgroupsizearb_layout.comp: skip
@@ -360,13 +348,10 @@ spec/arb_conservative_depth/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_conservative_depth/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_conservative_depth/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_conservative_depth/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_conservative_depth/preprocessor/enabled-core.comp: skip
 spec/arb_conservative_depth/preprocessor/enabled-core.tesc: skip
 spec/arb_conservative_depth/preprocessor/enabled-core.tese: skip
-spec/arb_derivative_control/preprocessor/disabled-defined-core.comp: skip
 spec/arb_derivative_control/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_derivative_control/preprocessor/disabled-defined-core.tese: skip
-spec/arb_derivative_control/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_derivative_control/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_derivative_control/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_derivative_control/preprocessor/enabled-core.comp: skip
@@ -391,7 +376,6 @@ spec/arb_draw_buffers/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_draw_buffers/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_draw_buffers/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_draw_buffers/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_draw_buffers/preprocessor/enabled-core.comp: skip
 spec/arb_draw_buffers/preprocessor/enabled-core.tesc: skip
 spec/arb_draw_buffers/preprocessor/enabled-core.tese: skip
 spec/arb_draw_instanced/preprocessor/disabled-defined-compat.frag: skip
@@ -410,25 +394,16 @@ spec/arb_draw_instanced/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_draw_instanced/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_draw_instanced/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_draw_instanced/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_draw_instanced/preprocessor/enabled-core.comp: skip
 spec/arb_draw_instanced/preprocessor/enabled-core.tesc: skip
 spec/arb_draw_instanced/preprocessor/enabled-core.tese: skip
 spec/arb_enhanced_layouts/compiler/compile-time-constants/invocation.geom: skip
-spec/arb_enhanced_layouts/compiler/compile-time-constants/local_size_x.comp: skip
-spec/arb_enhanced_layouts/compiler/compile-time-constants/local_size_y.comp: skip
-spec/arb_enhanced_layouts/compiler/compile-time-constants/local_size_z.comp: skip
 spec/arb_enhanced_layouts/compiler/compile-time-constants/negative-qualifiers/negative-layout-qualifier-invocation.geom: skip
-spec/arb_enhanced_layouts/compiler/compile-time-constants/negative-qualifiers/negative-layout-qualifier-local_size_x.comp: skip
-spec/arb_enhanced_layouts/compiler/compile-time-constants/negative-qualifiers/negative-layout-qualifier-local_size_y.comp: skip
-spec/arb_enhanced_layouts/compiler/compile-time-constants/negative-qualifiers/negative-layout-qualifier-local_size_z.comp: skip
 spec/arb_enhanced_layouts/compiler/compile-time-constants/negative-qualifiers/negative-layout-qualifier-stream.geom: skip
 spec/arb_enhanced_layouts/compiler/compile-time-constants/negative-qualifiers/negative-layout-qualifier-vertices.tesc: skip
 spec/arb_enhanced_layouts/compiler/compile-time-constants/stream.geom: skip
 spec/arb_enhanced_layouts/compiler/compile-time-constants/vertices.tesc: skip
 spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-identifiers/multiple-invocation-identifiers-in-single-layout-mismatch.geom: skip
 spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-identifiers/multiple-invocation-identifiers-in-single-layout.geom: skip
-spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-identifiers/multiple-local_size-identifiers-in-single-layout-mismatch.comp: skip
-spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-identifiers/multiple-local_size-identifiers-in-single-layout.comp: skip
 spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-identifiers/multiple-stream-identifiers-in-single-layout-global-no-enhanced-layouts.geom: skip
 spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-identifiers/multiple-stream-identifiers-in-single-layout-global.geom: skip
 spec/arb_enhanced_layouts/compiler/duplicate-layout-qualifier-identifiers/multiple-stream-identifiers-in-single-layout-no-enhanced-layouts.geom: skip
@@ -447,7 +422,6 @@ spec/arb_enhanced_layouts/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_enhanced_layouts/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_enhanced_layouts/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_enhanced_layouts/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_enhanced_layouts/preprocessor/enabled-core.comp: skip
 spec/arb_enhanced_layouts/preprocessor/enabled-core.tesc: skip
 spec/arb_enhanced_layouts/preprocessor/enabled-core.tese: skip
 spec/arb_es3_1_compatibility/preprocessor/disabled-defined-core.comp: skip
@@ -484,7 +458,6 @@ spec/arb_explicit_attrib_location/preprocessor/disabled-undefined-core.geom: ski
 spec/arb_explicit_attrib_location/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_explicit_attrib_location/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_explicit_attrib_location/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_explicit_attrib_location/preprocessor/enabled-core.comp: skip
 spec/arb_explicit_attrib_location/preprocessor/enabled-core.tesc: skip
 spec/arb_explicit_attrib_location/preprocessor/enabled-core.tese: skip
 spec/arb_explicit_uniform_location/preprocessor/disabled-defined-compat.frag: skip
@@ -503,7 +476,6 @@ spec/arb_explicit_uniform_location/preprocessor/disabled-undefined-core.geom: sk
 spec/arb_explicit_uniform_location/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_explicit_uniform_location/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_explicit_uniform_location/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_explicit_uniform_location/preprocessor/enabled-core.comp: skip
 spec/arb_explicit_uniform_location/preprocessor/enabled-core.tesc: skip
 spec/arb_explicit_uniform_location/preprocessor/enabled-core.tese: skip
 spec/arb_fragment_coord_conventions/preprocessor/disabled-defined-compat.frag: skip
@@ -522,7 +494,6 @@ spec/arb_fragment_coord_conventions/preprocessor/disabled-undefined-core.geom: s
 spec/arb_fragment_coord_conventions/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_fragment_coord_conventions/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_fragment_coord_conventions/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_fragment_coord_conventions/preprocessor/enabled-core.comp: skip
 spec/arb_fragment_coord_conventions/preprocessor/enabled-core.tesc: skip
 spec/arb_fragment_coord_conventions/preprocessor/enabled-core.tese: skip
 spec/arb_fragment_layer_viewport/preprocessor/disabled-defined-core.comp: skip
@@ -537,7 +508,6 @@ spec/arb_fragment_layer_viewport/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_fragment_layer_viewport/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_fragment_layer_viewport/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_fragment_layer_viewport/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_fragment_layer_viewport/preprocessor/enabled-core.comp: skip
 spec/arb_fragment_layer_viewport/preprocessor/enabled-core.tesc: skip
 spec/arb_fragment_layer_viewport/preprocessor/enabled-core.tese: skip
 spec/arb_fragment_shader_interlock/compiler/begininvocationinterlock-after-discard.frag: skip
@@ -584,10 +554,8 @@ spec/arb_geometry_shader4/compiler/sanity.geom: skip
 spec/arb_geometry_shader4/compiler/uniforms.geom: skip
 spec/arb_geometry_shader4/compiler/verticesin-const-expression.geom: skip
 spec/arb_geometry_shader4/compiler/verticesin-const.geom: skip
-spec/arb_geometry_shader4/preprocessor/disabled-defined-core.comp: skip
 spec/arb_geometry_shader4/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_geometry_shader4/preprocessor/disabled-defined-core.tese: skip
-spec/arb_geometry_shader4/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_geometry_shader4/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_geometry_shader4/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_geometry_shader4/preprocessor/enabled-compat.frag: skip
@@ -688,10 +656,8 @@ spec/arb_gpu_shader5/compiler/stream-qualifier/incorrect-in-layout-qualifier-str
 spec/arb_gpu_shader5/compiler/stream-qualifier/incorrect-multiple-block-layout-qualifier-stream.geom: skip
 spec/arb_gpu_shader5/compiler/stream-qualifier/incorrect-multiple-named-block-layout-qualifier-stream.geom: skip
 spec/arb_gpu_shader5/compiler/stream-qualifier/incorrect-negative-layout-qualifier-stream.geom: skip
-spec/arb_gpu_shader5/preprocessor/disabled-defined-core.comp: skip
 spec/arb_gpu_shader5/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_gpu_shader5/preprocessor/disabled-defined-core.tese: skip
-spec/arb_gpu_shader5/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_gpu_shader5/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_gpu_shader5/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_gpu_shader5/preprocessor/enabled-core.comp: skip
@@ -712,7 +678,6 @@ spec/arb_gpu_shader_fp64/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_gpu_shader_fp64/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_gpu_shader_fp64/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_gpu_shader_fp64/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_gpu_shader_fp64/preprocessor/enabled-core.comp: skip
 spec/arb_gpu_shader_fp64/preprocessor/enabled-core.tesc: skip
 spec/arb_gpu_shader_fp64/preprocessor/enabled-core.tese: skip
 spec/arb_gpu_shader_int64/compiler/built-in-functions/abs-i64vec2.frag: skip
@@ -1217,10 +1182,8 @@ spec/arb_sample_shading/compiler/gl_numsamples.frag: skip
 spec/arb_sample_shading/compiler/gl_sampleid.frag: skip
 spec/arb_sample_shading/compiler/gl_samplemask.frag: skip
 spec/arb_sample_shading/compiler/gl_sampleposition.frag: skip
-spec/arb_sample_shading/preprocessor/disabled-defined-core.comp: skip
 spec/arb_sample_shading/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_sample_shading/preprocessor/disabled-defined-core.tese: skip
-spec/arb_sample_shading/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_sample_shading/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_sample_shading/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_sample_shading/preprocessor/enabled-compat.frag: skip
@@ -1247,7 +1210,6 @@ spec/arb_separate_shader_objects/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_separate_shader_objects/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_separate_shader_objects/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_separate_shader_objects/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_separate_shader_objects/preprocessor/enabled-core.comp: skip
 spec/arb_separate_shader_objects/preprocessor/enabled-core.tesc: skip
 spec/arb_separate_shader_objects/preprocessor/enabled-core.tese: skip
 spec/arb_shader_atomic_counter_ops/preprocessor/disabled-defined-core.comp: skip
@@ -1262,7 +1224,6 @@ spec/arb_shader_atomic_counter_ops/preprocessor/disabled-undefined-core.geom: sk
 spec/arb_shader_atomic_counter_ops/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_atomic_counter_ops/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_atomic_counter_ops/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_atomic_counter_ops/preprocessor/enabled-core.comp: skip
 spec/arb_shader_atomic_counter_ops/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_atomic_counter_ops/preprocessor/enabled-core.tese: skip
 spec/arb_shader_atomic_counters/preprocessor/disabled-defined-compat.frag: skip
@@ -1281,7 +1242,6 @@ spec/arb_shader_atomic_counters/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_atomic_counters/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_atomic_counters/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_atomic_counters/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_atomic_counters/preprocessor/enabled-core.comp: skip
 spec/arb_shader_atomic_counters/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_atomic_counters/preprocessor/enabled-core.tese: skip
 spec/arb_shader_bit_encoding/preprocessor/disabled-defined-compat.frag: skip
@@ -1300,13 +1260,10 @@ spec/arb_shader_bit_encoding/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_bit_encoding/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_bit_encoding/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_bit_encoding/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_bit_encoding/preprocessor/enabled-core.comp: skip
 spec/arb_shader_bit_encoding/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_bit_encoding/preprocessor/enabled-core.tese: skip
-spec/arb_shader_clock/preprocessor/disabled-defined-core.comp: skip
 spec/arb_shader_clock/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_shader_clock/preprocessor/disabled-defined-core.tese: skip
-spec/arb_shader_clock/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_shader_clock/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_clock/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_clock/preprocessor/enabled-compat.frag: skip
@@ -1317,10 +1274,8 @@ spec/arb_shader_clock/preprocessor/enabled-core.geom: skip
 spec/arb_shader_clock/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_clock/preprocessor/enabled-core.tese: skip
 spec/arb_shader_clock/preprocessor/enabled-core.vert: skip
-spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.comp: skip
 spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.tese: skip
-spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_draw_parameters/preprocessor/enabled-core.comp: skip
@@ -1329,10 +1284,8 @@ spec/arb_shader_draw_parameters/preprocessor/enabled-core.geom: skip
 spec/arb_shader_draw_parameters/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_draw_parameters/preprocessor/enabled-core.tese: skip
 spec/arb_shader_draw_parameters/preprocessor/enabled-core.vert: skip
-spec/arb_shader_group_vote/preprocessor/disabled-defined-core.comp: skip
 spec/arb_shader_group_vote/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_shader_group_vote/preprocessor/disabled-defined-core.tese: skip
-spec/arb_shader_group_vote/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_shader_group_vote/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_group_vote/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_group_vote/preprocessor/enabled-compat.frag: skip
@@ -1359,7 +1312,6 @@ spec/arb_shader_image_load_store/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_image_load_store/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_image_load_store/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_image_load_store/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_image_load_store/preprocessor/enabled-core.comp: skip
 spec/arb_shader_image_load_store/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_image_load_store/preprocessor/enabled-core.tese: skip
 spec/arb_shader_image_size/preprocessor/disabled-defined-compat.frag: skip
@@ -1378,13 +1330,10 @@ spec/arb_shader_image_size/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_image_size/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_image_size/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_image_size/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_image_size/preprocessor/enabled-core.comp: skip
 spec/arb_shader_image_size/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_image_size/preprocessor/enabled-core.tese: skip
-spec/arb_shader_precision/preprocessor/disabled-defined-core.comp: skip
 spec/arb_shader_precision/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_shader_precision/preprocessor/disabled-defined-core.tese: skip
-spec/arb_shader_precision/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_shader_precision/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_precision/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_precision/preprocessor/enabled-compat.frag: skip
@@ -1411,10 +1360,8 @@ spec/arb_shader_stencil_export/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_stencil_export/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_stencil_export/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_stencil_export/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_stencil_export/preprocessor/enabled-core.comp: skip
 spec/arb_shader_stencil_export/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_stencil_export/preprocessor/enabled-core.tese: skip
-spec/arb_shader_storage_buffer_object/compiler/shared-layout-qualifier.frag: skip
 spec/arb_shader_storage_buffer_object/compiler/unused-array-element.comp: skip
 spec/arb_shader_storage_buffer_object/compiler/unused-array-element.frag: skip
 spec/arb_shader_storage_buffer_object/preprocessor/disabled-defined-compat.frag: skip
@@ -1433,7 +1380,6 @@ spec/arb_shader_storage_buffer_object/preprocessor/disabled-undefined-core.geom:
 spec/arb_shader_storage_buffer_object/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_storage_buffer_object/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_storage_buffer_object/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_storage_buffer_object/preprocessor/enabled-core.comp: skip
 spec/arb_shader_storage_buffer_object/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_storage_buffer_object/preprocessor/enabled-core.tese: skip
 spec/arb_shader_subroutine/preprocessor/disabled-defined-core.comp: skip
@@ -1448,16 +1394,13 @@ spec/arb_shader_subroutine/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_subroutine/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_subroutine/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_subroutine/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_subroutine/preprocessor/enabled-core.comp: skip
 spec/arb_shader_subroutine/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_subroutine/preprocessor/enabled-core.tese: skip
 spec/arb_shader_texture_image_samples/compiler/fs-image-samples.frag: skip
 spec/arb_shader_texture_image_samples/compiler/fs-texture-samples.frag: skip
 spec/arb_shader_texture_image_samples/compiler/vs-texture-samples.vert: skip
-spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.comp: skip
 spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.tese: skip
-spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_texture_image_samples/preprocessor/enabled-compat.frag: skip
@@ -1484,7 +1427,6 @@ spec/arb_shader_texture_lod/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_texture_lod/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_texture_lod/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_texture_lod/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_texture_lod/preprocessor/enabled-core.comp: skip
 spec/arb_shader_texture_lod/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_texture_lod/preprocessor/enabled-core.tese: skip
 spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-input-non-value-layout-qualifier-in-single-declaration-1.geom: skip
@@ -1492,8 +1434,6 @@ spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-input-non-
 spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-input-value-layout-qualifier-in-single-declaration-3.geom: skip
 spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-input-value-layout-qualifier-in-single-declaration-4.geom: skip
 spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-invocation-in-single-declaration.geom: skip
-spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-local_size-in-single-declaration-mismatch.comp: skip
-spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-local_size-in-single-declaration.comp: skip
 spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-stream-qualifier-in-single-declaration-420-pack.geom: skip
 spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-stream-qualifier-in-single-declaration-no-420-pack.geom: skip
 spec/arb_shading_language_420pack/compiler/layout-qualifiers/multiple-stream-qualifier-in-single-global-declaration-420-pack.geom: skip
@@ -1516,7 +1456,6 @@ spec/arb_shading_language_420pack/preprocessor/disabled-undefined-core.geom: ski
 spec/arb_shading_language_420pack/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shading_language_420pack/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shading_language_420pack/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shading_language_420pack/preprocessor/enabled-core.comp: skip
 spec/arb_shading_language_420pack/preprocessor/enabled-core.tesc: skip
 spec/arb_shading_language_420pack/preprocessor/enabled-core.tese: skip
 spec/arb_shading_language_packing/preprocessor/disabled-defined-compat.frag: skip
@@ -1535,7 +1474,6 @@ spec/arb_shading_language_packing/preprocessor/disabled-undefined-core.geom: ski
 spec/arb_shading_language_packing/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shading_language_packing/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shading_language_packing/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shading_language_packing/preprocessor/enabled-core.comp: skip
 spec/arb_shading_language_packing/preprocessor/enabled-core.tesc: skip
 spec/arb_shading_language_packing/preprocessor/enabled-core.tese: skip
 spec/arb_tessellation_shader/compiler/barrier-for.tesc: skip
@@ -1587,10 +1525,8 @@ spec/arb_tessellation_shader/compiler/redeclaring-gl_out-ok.tesc: skip
 spec/arb_tessellation_shader/compiler/sanity.tesc: skip
 spec/arb_tessellation_shader/compiler/sanity.tese: skip
 spec/arb_tessellation_shader/compiler/uniform-block-non-array.tesc: skip
-spec/arb_tessellation_shader/preprocessor/disabled-defined-core.comp: skip
 spec/arb_tessellation_shader/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_tessellation_shader/preprocessor/disabled-defined-core.tese: skip
-spec/arb_tessellation_shader/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_tessellation_shader/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_tessellation_shader/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_tessellation_shader/preprocessor/enabled-core.comp: skip
@@ -1615,7 +1551,6 @@ spec/arb_texture_cube_map_array/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_texture_cube_map_array/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_texture_cube_map_array/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_texture_cube_map_array/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_texture_cube_map_array/preprocessor/enabled-core.comp: skip
 spec/arb_texture_cube_map_array/preprocessor/enabled-core.tesc: skip
 spec/arb_texture_cube_map_array/preprocessor/enabled-core.tese: skip
 spec/arb_texture_gather/preprocessor/disabled-defined-compat.frag: skip
@@ -1634,7 +1569,6 @@ spec/arb_texture_gather/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_texture_gather/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_texture_gather/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_texture_gather/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_texture_gather/preprocessor/enabled-core.comp: skip
 spec/arb_texture_gather/preprocessor/enabled-core.tesc: skip
 spec/arb_texture_gather/preprocessor/enabled-core.tese: skip
 spec/arb_texture_multisample/preprocessor/disabled-defined-compat.frag: skip
@@ -1653,7 +1587,6 @@ spec/arb_texture_multisample/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_texture_multisample/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_texture_multisample/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_texture_multisample/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_texture_multisample/preprocessor/enabled-core.comp: skip
 spec/arb_texture_multisample/preprocessor/enabled-core.tesc: skip
 spec/arb_texture_multisample/preprocessor/enabled-core.tese: skip
 spec/arb_texture_query_levels/preprocessor/disabled-defined-compat.frag: skip
@@ -1672,7 +1605,6 @@ spec/arb_texture_query_levels/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_texture_query_levels/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_texture_query_levels/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_texture_query_levels/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_texture_query_levels/preprocessor/enabled-core.comp: skip
 spec/arb_texture_query_levels/preprocessor/enabled-core.tesc: skip
 spec/arb_texture_query_levels/preprocessor/enabled-core.tese: skip
 spec/arb_texture_query_lod/preprocessor/disabled-defined-compat.frag: skip
@@ -1691,7 +1623,6 @@ spec/arb_texture_query_lod/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_texture_query_lod/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_texture_query_lod/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_texture_query_lod/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_texture_query_lod/preprocessor/enabled-core.comp: skip
 spec/arb_texture_query_lod/preprocessor/enabled-core.tesc: skip
 spec/arb_texture_query_lod/preprocessor/enabled-core.tese: skip
 spec/arb_texture_rectangle/preprocessor/disabled-defined-compat.frag: skip
@@ -1710,7 +1641,6 @@ spec/arb_texture_rectangle/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_texture_rectangle/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_texture_rectangle/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_texture_rectangle/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_texture_rectangle/preprocessor/enabled-core.comp: skip
 spec/arb_texture_rectangle/preprocessor/enabled-core.tesc: skip
 spec/arb_texture_rectangle/preprocessor/enabled-core.tese: skip
 spec/arb_uniform_buffer_object/preprocessor/disabled-defined-compat.frag: skip
@@ -1729,7 +1659,6 @@ spec/arb_uniform_buffer_object/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_uniform_buffer_object/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_uniform_buffer_object/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_uniform_buffer_object/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_uniform_buffer_object/preprocessor/enabled-core.comp: skip
 spec/arb_uniform_buffer_object/preprocessor/enabled-core.tesc: skip
 spec/arb_uniform_buffer_object/preprocessor/enabled-core.tese: skip
 spec/arb_vertex_attrib_64bit/preprocessor/disabled-defined-core.comp: skip
@@ -1744,7 +1673,6 @@ spec/arb_vertex_attrib_64bit/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_vertex_attrib_64bit/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_vertex_attrib_64bit/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_vertex_attrib_64bit/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_vertex_attrib_64bit/preprocessor/enabled-core.comp: skip
 spec/arb_vertex_attrib_64bit/preprocessor/enabled-core.tesc: skip
 spec/arb_vertex_attrib_64bit/preprocessor/enabled-core.tese: skip
 spec/arb_viewport_array/preprocessor/disabled-defined-compat.frag: skip
@@ -1763,7 +1691,6 @@ spec/arb_viewport_array/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_viewport_array/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_viewport_array/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_viewport_array/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_viewport_array/preprocessor/enabled-core.comp: skip
 spec/arb_viewport_array/preprocessor/enabled-core.tesc: skip
 spec/arb_viewport_array/preprocessor/enabled-core.tese: skip
 spec/ext_clip_cull_distance/preprocessor/disabled-defined-es.comp: skip
@@ -1778,7 +1705,6 @@ spec/ext_clip_cull_distance/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_clip_cull_distance/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_clip_cull_distance/preprocessor/disabled-undefined-es.tese: skip
 spec/ext_clip_cull_distance/preprocessor/disabled-undefined-es.vert: skip
-spec/ext_clip_cull_distance/preprocessor/enabled-es.comp: skip
 spec/ext_clip_cull_distance/preprocessor/enabled-es.geom: skip
 spec/ext_clip_cull_distance/preprocessor/enabled-es.tesc: skip
 spec/ext_clip_cull_distance/preprocessor/enabled-es.tese: skip
@@ -1797,40 +1723,27 @@ spec/ext_draw_buffers/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_draw_buffers/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_draw_buffers/preprocessor/disabled-undefined-es.tese: skip
 spec/ext_draw_buffers/preprocessor/disabled-undefined-es.vert: skip
-spec/ext_draw_buffers/preprocessor/enabled-es.comp: skip
 spec/ext_draw_buffers/preprocessor/enabled-es.geom: skip
 spec/ext_draw_buffers/preprocessor/enabled-es.tesc: skip
 spec/ext_draw_buffers/preprocessor/enabled-es.tese: skip
-spec/ext_geometry_point_size/preprocessor/disabled-defined-es.comp: skip
-spec/ext_geometry_point_size/preprocessor/disabled-defined-es.frag: skip
 spec/ext_geometry_point_size/preprocessor/disabled-defined-es.geom: skip
 spec/ext_geometry_point_size/preprocessor/disabled-defined-es.tesc: skip
 spec/ext_geometry_point_size/preprocessor/disabled-defined-es.tese: skip
-spec/ext_geometry_point_size/preprocessor/disabled-defined-es.vert: skip
-spec/ext_geometry_point_size/preprocessor/disabled-undefined-es.comp: skip
-spec/ext_geometry_point_size/preprocessor/disabled-undefined-es.frag: skip
 spec/ext_geometry_point_size/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_geometry_point_size/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_geometry_point_size/preprocessor/disabled-undefined-es.tese: skip
-spec/ext_geometry_point_size/preprocessor/disabled-undefined-es.vert: skip
 spec/ext_geometry_point_size/preprocessor/enabled-es.comp: skip
 spec/ext_geometry_point_size/preprocessor/enabled-es.frag: skip
 spec/ext_geometry_point_size/preprocessor/enabled-es.geom: skip
 spec/ext_geometry_point_size/preprocessor/enabled-es.tesc: skip
 spec/ext_geometry_point_size/preprocessor/enabled-es.tese: skip
 spec/ext_geometry_point_size/preprocessor/enabled-es.vert: skip
-spec/ext_geometry_shader/preprocessor/disabled-defined-es.comp: skip
-spec/ext_geometry_shader/preprocessor/disabled-defined-es.frag: skip
 spec/ext_geometry_shader/preprocessor/disabled-defined-es.geom: skip
 spec/ext_geometry_shader/preprocessor/disabled-defined-es.tesc: skip
 spec/ext_geometry_shader/preprocessor/disabled-defined-es.tese: skip
-spec/ext_geometry_shader/preprocessor/disabled-defined-es.vert: skip
-spec/ext_geometry_shader/preprocessor/disabled-undefined-es.comp: skip
-spec/ext_geometry_shader/preprocessor/disabled-undefined-es.frag: skip
 spec/ext_geometry_shader/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_geometry_shader/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_geometry_shader/preprocessor/disabled-undefined-es.tese: skip
-spec/ext_geometry_shader/preprocessor/disabled-undefined-es.vert: skip
 spec/ext_geometry_shader/preprocessor/enabled-es.comp: skip
 spec/ext_geometry_shader/preprocessor/enabled-es.frag: skip
 spec/ext_geometry_shader/preprocessor/enabled-es.geom: skip
@@ -2869,18 +2782,12 @@ spec/ext_gpu_shader4/compiler/xor-uvec4-unsigned_int.frag: skip
 spec/ext_gpu_shader4/compiler/xor-uvec4-unsigned_int.vert: skip
 spec/ext_gpu_shader4/compiler/xor-uvec4-uvec4.frag: skip
 spec/ext_gpu_shader4/compiler/xor-uvec4-uvec4.vert: skip
-spec/ext_gpu_shader5/preprocessor/disabled-defined-es.comp: skip
-spec/ext_gpu_shader5/preprocessor/disabled-defined-es.frag: skip
 spec/ext_gpu_shader5/preprocessor/disabled-defined-es.geom: skip
 spec/ext_gpu_shader5/preprocessor/disabled-defined-es.tesc: skip
 spec/ext_gpu_shader5/preprocessor/disabled-defined-es.tese: skip
-spec/ext_gpu_shader5/preprocessor/disabled-defined-es.vert: skip
-spec/ext_gpu_shader5/preprocessor/disabled-undefined-es.comp: skip
-spec/ext_gpu_shader5/preprocessor/disabled-undefined-es.frag: skip
 spec/ext_gpu_shader5/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_gpu_shader5/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_gpu_shader5/preprocessor/disabled-undefined-es.tese: skip
-spec/ext_gpu_shader5/preprocessor/disabled-undefined-es.vert: skip
 spec/ext_gpu_shader5/preprocessor/enabled-es.comp: skip
 spec/ext_gpu_shader5/preprocessor/enabled-es.frag: skip
 spec/ext_gpu_shader5/preprocessor/enabled-es.geom: skip
@@ -2899,7 +2806,6 @@ spec/ext_separate_shader_objects/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_separate_shader_objects/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_separate_shader_objects/preprocessor/disabled-undefined-es.tese: skip
 spec/ext_separate_shader_objects/preprocessor/disabled-undefined-es.vert: skip
-spec/ext_separate_shader_objects/preprocessor/enabled-es.comp: skip
 spec/ext_separate_shader_objects/preprocessor/enabled-es.geom: skip
 spec/ext_separate_shader_objects/preprocessor/enabled-es.tesc: skip
 spec/ext_separate_shader_objects/preprocessor/enabled-es.tese: skip
@@ -2929,12 +2835,9 @@ spec/ext_shader_io_blocks/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_shader_io_blocks/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_shader_io_blocks/preprocessor/disabled-undefined-es.tese: skip
 spec/ext_shader_io_blocks/preprocessor/disabled-undefined-es.vert: skip
-spec/ext_shader_io_blocks/preprocessor/enabled-es.comp: skip
-spec/ext_shader_io_blocks/preprocessor/enabled-es.frag: skip
 spec/ext_shader_io_blocks/preprocessor/enabled-es.geom: skip
 spec/ext_shader_io_blocks/preprocessor/enabled-es.tesc: skip
 spec/ext_shader_io_blocks/preprocessor/enabled-es.tese: skip
-spec/ext_shader_io_blocks/preprocessor/enabled-es.vert: skip
 spec/ext_shader_samples_identical/glsl-1.10/compiler/all-functions.frag: skip
 spec/ext_shader_samples_identical/glsl-1.10/compiler/all-functions.vert: skip
 spec/ext_shader_samples_identical/glsl-1.50/compiler/all-functions.frag: skip
@@ -2942,24 +2845,16 @@ spec/ext_shader_samples_identical/glsl-1.50/compiler/all-functions.geom: skip
 spec/ext_shader_samples_identical/glsl-1.50/compiler/all-functions.vert: skip
 spec/ext_shader_samples_identical/glsl-es-3.10/compiler/all-functions.frag: skip
 spec/ext_shader_samples_identical/glsl-es-3.10/compiler/all-functions.vert: skip
-spec/ext_shader_samples_identical/preprocessor/disabled-defined-core.comp: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-defined-core.tesc: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-defined-core.tese: skip
-spec/ext_shader_samples_identical/preprocessor/disabled-defined-es.comp: skip
-spec/ext_shader_samples_identical/preprocessor/disabled-defined-es.frag: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-defined-es.geom: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-defined-es.tesc: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-defined-es.tese: skip
-spec/ext_shader_samples_identical/preprocessor/disabled-defined-es.vert: skip
-spec/ext_shader_samples_identical/preprocessor/disabled-undefined-core.comp: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-undefined-core.tesc: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-undefined-core.tese: skip
-spec/ext_shader_samples_identical/preprocessor/disabled-undefined-es.comp: skip
-spec/ext_shader_samples_identical/preprocessor/disabled-undefined-es.frag: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_shader_samples_identical/preprocessor/disabled-undefined-es.tese: skip
-spec/ext_shader_samples_identical/preprocessor/disabled-undefined-es.vert: skip
 spec/ext_shader_samples_identical/preprocessor/enabled-compat.frag: skip
 spec/ext_shader_samples_identical/preprocessor/enabled-compat.vert: skip
 spec/ext_shader_samples_identical/preprocessor/enabled-core.comp: skip
@@ -2990,7 +2885,6 @@ spec/ext_texture_array/preprocessor/disabled-undefined-core.geom: skip
 spec/ext_texture_array/preprocessor/disabled-undefined-core.tesc: skip
 spec/ext_texture_array/preprocessor/disabled-undefined-core.tese: skip
 spec/ext_texture_array/preprocessor/disabled-undefined-core.vert: skip
-spec/ext_texture_array/preprocessor/enabled-core.comp: skip
 spec/ext_texture_array/preprocessor/enabled-core.tesc: skip
 spec/ext_texture_array/preprocessor/enabled-core.tese: skip
 spec/ext_texture_buffer/preprocessor/disabled-defined-es.comp: skip
@@ -3005,12 +2899,9 @@ spec/ext_texture_buffer/preprocessor/disabled-undefined-es.geom: skip
 spec/ext_texture_buffer/preprocessor/disabled-undefined-es.tesc: skip
 spec/ext_texture_buffer/preprocessor/disabled-undefined-es.tese: skip
 spec/ext_texture_buffer/preprocessor/disabled-undefined-es.vert: skip
-spec/ext_texture_buffer/preprocessor/enabled-es.comp: skip
-spec/ext_texture_buffer/preprocessor/enabled-es.frag: skip
 spec/ext_texture_buffer/preprocessor/enabled-es.geom: skip
 spec/ext_texture_buffer/preprocessor/enabled-es.tesc: skip
 spec/ext_texture_buffer/preprocessor/enabled-es.tese: skip
-spec/ext_texture_buffer/preprocessor/enabled-es.vert: skip
 spec/ext_texture_shadow_lod/compiler/negative_compile.frag: skip
 spec/ext_texture_shadow_lod/compiler/sampler2darray.frag: skip
 spec/ext_texture_shadow_lod/compiler/samplercube.frag: skip
@@ -4836,8 +4727,6 @@ spec/glsl-4.00/compiler/inout/vs-input-dvec2.vert: skip
 spec/glsl-4.00/compiler/inout/vs-input-dvec3.vert: skip
 spec/glsl-4.00/compiler/inout/vs-input-dvec4.vert: skip
 spec/glsl-4.40/compiler/inout-parameter-qualifier.frag: skip
-spec/glsl-es-3.10/compiler/helper-invocation.frag: skip
-spec/glsl-es-3.10/compiler/unsized-array-not-in-last-position.comp: skip
 spec/glsl-es-3.20/compiler/flat_interpolation/default-interface_block-array-int-bad.frag: skip
 spec/glsl-es-3.20/compiler/flat_interpolation/default-interface_block-array-ivec2-bad.frag: skip
 spec/glsl-es-3.20/compiler/flat_interpolation/default-interface_block-array-ivec3-bad.frag: skip
@@ -4982,14 +4871,6 @@ spec/nv_image_formats/compiler/declaration-disallow-rgba16-unorm-3d.frag: skip
 spec/nv_image_formats/compiler/declaration-disallow-rgba16-unorm-3d.vert: skip
 spec/nv_image_formats/compiler/declaration-disallow-rgba16-unorm-cube.frag: skip
 spec/nv_image_formats/compiler/declaration-disallow-rgba16-unorm-cube.vert: skip
-spec/nv_image_formats/compiler/declarations-with-norm16-2d-array.frag: skip
-spec/nv_image_formats/compiler/declarations-with-norm16-2d-array.vert: skip
-spec/nv_image_formats/compiler/declarations-with-norm16-2d.frag: skip
-spec/nv_image_formats/compiler/declarations-with-norm16-2d.vert: skip
-spec/nv_image_formats/compiler/declarations-with-norm16-3d.frag: skip
-spec/nv_image_formats/compiler/declarations-with-norm16-3d.vert: skip
-spec/nv_image_formats/compiler/declarations-with-norm16-cube.frag: skip
-spec/nv_image_formats/compiler/declarations-with-norm16-cube.vert: skip
 spec/nv_image_formats/compiler/declarations-without-norm16-2d-array.frag: skip
 spec/nv_image_formats/compiler/declarations-without-norm16-2d-array.vert: skip
 spec/nv_image_formats/compiler/declarations-without-norm16-2d.frag: skip
@@ -5010,12 +4891,9 @@ spec/nv_image_formats/preprocessor/disabled-undefined-es.geom: skip
 spec/nv_image_formats/preprocessor/disabled-undefined-es.tesc: skip
 spec/nv_image_formats/preprocessor/disabled-undefined-es.tese: skip
 spec/nv_image_formats/preprocessor/disabled-undefined-es.vert: skip
-spec/nv_image_formats/preprocessor/enabled-es.comp: skip
-spec/nv_image_formats/preprocessor/enabled-es.frag: skip
 spec/nv_image_formats/preprocessor/enabled-es.geom: skip
 spec/nv_image_formats/preprocessor/enabled-es.tesc: skip
 spec/nv_image_formats/preprocessor/enabled-es.tese: skip
-spec/nv_image_formats/preprocessor/enabled-es.vert: skip
 spec/nv_shader_atomic_float/compiler/imageatomicadd-float-image1d.frag: skip
 spec/nv_shader_atomic_float/compiler/imageatomicadd-float-image1darray.frag: skip
 spec/nv_shader_atomic_float/compiler/imageatomicadd-float-image2d-fail.frag: skip
@@ -5044,11 +4922,9 @@ spec/nv_shader_atomic_float/compiler/shared-atomicadd-float-fail.comp: skip
 spec/nv_shader_atomic_float/compiler/shared-atomicexchange-float-fail.comp: skip
 spec/nv_shader_atomic_float/compiler/ssbo-atomicadd-float-fail.frag: skip
 spec/nv_shader_atomic_float/compiler/ssbo-atomicexchange-float-fail.frag: skip
-spec/oes_blend_func_extended/preprocessor/disabled-defined-es.comp: skip
 spec/oes_blend_func_extended/preprocessor/disabled-defined-es.geom: skip
 spec/oes_blend_func_extended/preprocessor/disabled-defined-es.tesc: skip
 spec/oes_blend_func_extended/preprocessor/disabled-defined-es.tese: skip
-spec/oes_blend_func_extended/preprocessor/disabled-undefined-es.comp: skip
 spec/oes_blend_func_extended/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_blend_func_extended/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_blend_func_extended/preprocessor/disabled-undefined-es.tese: skip
@@ -5070,69 +4946,48 @@ spec/oes_egl_image_external/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_egl_image_external/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_egl_image_external/preprocessor/disabled-undefined-es.tese: skip
 spec/oes_egl_image_external/preprocessor/disabled-undefined-es.vert: skip
-spec/oes_egl_image_external/preprocessor/enabled-es.comp: skip
 spec/oes_egl_image_external/preprocessor/enabled-es.geom: skip
 spec/oes_egl_image_external/preprocessor/enabled-es.tesc: skip
 spec/oes_egl_image_external/preprocessor/enabled-es.tese: skip
-spec/oes_geometry_point_size/preprocessor/disabled-defined-es.comp: skip
-spec/oes_geometry_point_size/preprocessor/disabled-defined-es.frag: skip
 spec/oes_geometry_point_size/preprocessor/disabled-defined-es.geom: skip
 spec/oes_geometry_point_size/preprocessor/disabled-defined-es.tesc: skip
 spec/oes_geometry_point_size/preprocessor/disabled-defined-es.tese: skip
-spec/oes_geometry_point_size/preprocessor/disabled-defined-es.vert: skip
-spec/oes_geometry_point_size/preprocessor/disabled-undefined-es.comp: skip
-spec/oes_geometry_point_size/preprocessor/disabled-undefined-es.frag: skip
 spec/oes_geometry_point_size/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_geometry_point_size/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_geometry_point_size/preprocessor/disabled-undefined-es.tese: skip
-spec/oes_geometry_point_size/preprocessor/disabled-undefined-es.vert: skip
 spec/oes_geometry_point_size/preprocessor/enabled-es.comp: skip
 spec/oes_geometry_point_size/preprocessor/enabled-es.frag: skip
 spec/oes_geometry_point_size/preprocessor/enabled-es.geom: skip
 spec/oes_geometry_point_size/preprocessor/enabled-es.tesc: skip
 spec/oes_geometry_point_size/preprocessor/enabled-es.tese: skip
 spec/oes_geometry_point_size/preprocessor/enabled-es.vert: skip
-spec/oes_geometry_shader/preprocessor/disabled-defined-es.comp: skip
-spec/oes_geometry_shader/preprocessor/disabled-defined-es.frag: skip
 spec/oes_geometry_shader/preprocessor/disabled-defined-es.geom: skip
 spec/oes_geometry_shader/preprocessor/disabled-defined-es.tesc: skip
 spec/oes_geometry_shader/preprocessor/disabled-defined-es.tese: skip
-spec/oes_geometry_shader/preprocessor/disabled-defined-es.vert: skip
-spec/oes_geometry_shader/preprocessor/disabled-undefined-es.comp: skip
-spec/oes_geometry_shader/preprocessor/disabled-undefined-es.frag: skip
 spec/oes_geometry_shader/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_geometry_shader/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_geometry_shader/preprocessor/disabled-undefined-es.tese: skip
-spec/oes_geometry_shader/preprocessor/disabled-undefined-es.vert: skip
 spec/oes_geometry_shader/preprocessor/enabled-es.comp: skip
 spec/oes_geometry_shader/preprocessor/enabled-es.frag: skip
 spec/oes_geometry_shader/preprocessor/enabled-es.geom: skip
 spec/oes_geometry_shader/preprocessor/enabled-es.tesc: skip
 spec/oes_geometry_shader/preprocessor/enabled-es.tese: skip
 spec/oes_geometry_shader/preprocessor/enabled-es.vert: skip
-spec/oes_gpu_shader5/preprocessor/disabled-defined-es.comp: skip
-spec/oes_gpu_shader5/preprocessor/disabled-defined-es.frag: skip
 spec/oes_gpu_shader5/preprocessor/disabled-defined-es.geom: skip
 spec/oes_gpu_shader5/preprocessor/disabled-defined-es.tesc: skip
 spec/oes_gpu_shader5/preprocessor/disabled-defined-es.tese: skip
-spec/oes_gpu_shader5/preprocessor/disabled-defined-es.vert: skip
-spec/oes_gpu_shader5/preprocessor/disabled-undefined-es.comp: skip
-spec/oes_gpu_shader5/preprocessor/disabled-undefined-es.frag: skip
 spec/oes_gpu_shader5/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_gpu_shader5/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_gpu_shader5/preprocessor/disabled-undefined-es.tese: skip
-spec/oes_gpu_shader5/preprocessor/disabled-undefined-es.vert: skip
 spec/oes_gpu_shader5/preprocessor/enabled-es.comp: skip
 spec/oes_gpu_shader5/preprocessor/enabled-es.frag: skip
 spec/oes_gpu_shader5/preprocessor/enabled-es.geom: skip
 spec/oes_gpu_shader5/preprocessor/enabled-es.tesc: skip
 spec/oes_gpu_shader5/preprocessor/enabled-es.tese: skip
 spec/oes_gpu_shader5/preprocessor/enabled-es.vert: skip
-spec/oes_multisample_interpolation/preprocessor/disabled-defined-es.comp: skip
 spec/oes_multisample_interpolation/preprocessor/disabled-defined-es.geom: skip
 spec/oes_multisample_interpolation/preprocessor/disabled-defined-es.tesc: skip
 spec/oes_multisample_interpolation/preprocessor/disabled-defined-es.tese: skip
-spec/oes_multisample_interpolation/preprocessor/disabled-undefined-es.comp: skip
 spec/oes_multisample_interpolation/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_multisample_interpolation/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_multisample_interpolation/preprocessor/disabled-undefined-es.tese: skip
@@ -5142,11 +4997,9 @@ spec/oes_multisample_interpolation/preprocessor/enabled-es.geom: skip
 spec/oes_multisample_interpolation/preprocessor/enabled-es.tesc: skip
 spec/oes_multisample_interpolation/preprocessor/enabled-es.tese: skip
 spec/oes_multisample_interpolation/preprocessor/enabled-es.vert: skip
-spec/oes_sample_variables/preprocessor/disabled-defined-es.comp: skip
 spec/oes_sample_variables/preprocessor/disabled-defined-es.geom: skip
 spec/oes_sample_variables/preprocessor/disabled-defined-es.tesc: skip
 spec/oes_sample_variables/preprocessor/disabled-defined-es.tese: skip
-spec/oes_sample_variables/preprocessor/disabled-undefined-es.comp: skip
 spec/oes_sample_variables/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_sample_variables/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_sample_variables/preprocessor/disabled-undefined-es.tese: skip
@@ -5168,22 +5021,10 @@ spec/oes_shader_image_atomic/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_shader_image_atomic/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_shader_image_atomic/preprocessor/disabled-undefined-es.tese: skip
 spec/oes_shader_image_atomic/preprocessor/disabled-undefined-es.vert: skip
-spec/oes_shader_image_atomic/preprocessor/enabled-es.comp: skip
-spec/oes_shader_image_atomic/preprocessor/enabled-es.frag: skip
 spec/oes_shader_image_atomic/preprocessor/enabled-es.geom: skip
 spec/oes_shader_image_atomic/preprocessor/enabled-es.tesc: skip
 spec/oes_shader_image_atomic/preprocessor/enabled-es.tese: skip
-spec/oes_shader_image_atomic/preprocessor/enabled-es.vert: skip
-spec/oes_shader_io_blocks/compiler/layout-component.vert: skip
-spec/oes_shader_io_blocks/compiler/layout-depth_any.frag: skip
-spec/oes_shader_io_blocks/compiler/layout-depth_greater.frag: skip
-spec/oes_shader_io_blocks/compiler/layout-depth_less.frag: skip
-spec/oes_shader_io_blocks/compiler/layout-depth_unchanged.frag: skip
-spec/oes_shader_io_blocks/compiler/layout-gl_clipdistance.frag: skip
-spec/oes_shader_io_blocks/compiler/layout-gl_clipdistance.vert: skip
-spec/oes_shader_io_blocks/compiler/layout-gl_perfragment.frag: skip
-spec/oes_shader_io_blocks/compiler/layout-location-aliasing.vert: skip
-spec/oes_shader_io_blocks/compiler/layout-output-index.frag: skip
+spec/oes_shader_io_blocks/compiler/layout-location-aliasing.vert: fail
 spec/oes_shader_io_blocks/preprocessor/disabled-defined-es.comp: skip
 spec/oes_shader_io_blocks/preprocessor/disabled-defined-es.frag: skip
 spec/oes_shader_io_blocks/preprocessor/disabled-defined-es.geom: skip
@@ -5196,12 +5037,9 @@ spec/oes_shader_io_blocks/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_shader_io_blocks/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_shader_io_blocks/preprocessor/disabled-undefined-es.tese: skip
 spec/oes_shader_io_blocks/preprocessor/disabled-undefined-es.vert: skip
-spec/oes_shader_io_blocks/preprocessor/enabled-es.comp: skip
-spec/oes_shader_io_blocks/preprocessor/enabled-es.frag: skip
 spec/oes_shader_io_blocks/preprocessor/enabled-es.geom: skip
 spec/oes_shader_io_blocks/preprocessor/enabled-es.tesc: skip
 spec/oes_shader_io_blocks/preprocessor/enabled-es.tese: skip
-spec/oes_shader_io_blocks/preprocessor/enabled-es.vert: skip
 spec/oes_standard_derivatives/preprocessor/disabled-defined-es.comp: skip
 spec/oes_standard_derivatives/preprocessor/disabled-defined-es.frag: skip
 spec/oes_standard_derivatives/preprocessor/disabled-defined-es.geom: skip
@@ -5214,7 +5052,6 @@ spec/oes_standard_derivatives/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_standard_derivatives/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_standard_derivatives/preprocessor/disabled-undefined-es.tese: skip
 spec/oes_standard_derivatives/preprocessor/disabled-undefined-es.vert: skip
-spec/oes_standard_derivatives/preprocessor/enabled-es.comp: skip
 spec/oes_standard_derivatives/preprocessor/enabled-es.geom: skip
 spec/oes_standard_derivatives/preprocessor/enabled-es.tesc: skip
 spec/oes_standard_derivatives/preprocessor/enabled-es.tese: skip
@@ -5230,12 +5067,9 @@ spec/oes_texture_buffer/preprocessor/disabled-undefined-es.geom: skip
 spec/oes_texture_buffer/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_texture_buffer/preprocessor/disabled-undefined-es.tese: skip
 spec/oes_texture_buffer/preprocessor/disabled-undefined-es.vert: skip
-spec/oes_texture_buffer/preprocessor/enabled-es.comp: skip
-spec/oes_texture_buffer/preprocessor/enabled-es.frag: skip
 spec/oes_texture_buffer/preprocessor/enabled-es.geom: skip
 spec/oes_texture_buffer/preprocessor/enabled-es.tesc: skip
 spec/oes_texture_buffer/preprocessor/enabled-es.tese: skip
-spec/oes_texture_buffer/preprocessor/enabled-es.vert: skip
 spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-defined-es.comp: skip
 spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-defined-es.frag: skip
 spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-defined-es.geom: skip
@@ -5248,19 +5082,16 @@ spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es
 spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es.tesc: skip
 spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es.tese: skip
 spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es.vert: skip
-spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.comp: skip
-spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.frag: skip
 spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.geom: skip
 spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.tesc: skip
 spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.tese: skip
-spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.vert: skip
 summary:
        name:  results
        ----  --------
-       pass:     9527
-       fail:        1
+       pass:     9696
+       fail:        2
       crash:        0
-       skip:     5255
+       skip:     5085
     timeout:        0
        warn:        0
  incomplete:        0
diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt
index e62c7c6f5e0..c808b487bc4 100644
--- a/.gitlab-ci/piglit/quick_gl.txt
+++ b/.gitlab-ci/piglit/quick_gl.txt
@@ -433,24 +433,8 @@ spec/arb_bindless_texture/legal: skip
 spec/arb_bindless_texture/limit: skip
 spec/arb_bindless_texture/uint64_attribs: skip
 spec/arb_bindless_texture/uniform: skip
-spec/arb_buffer_storage/bufferstorage-persistent_gles3 draw: skip
-spec/arb_buffer_storage/bufferstorage-persistent_gles3 draw client-storage: skip
-spec/arb_buffer_storage/bufferstorage-persistent_gles3 draw coherent: skip
-spec/arb_buffer_storage/bufferstorage-persistent_gles3 draw coherent client-storage: skip
-spec/arb_buffer_storage/bufferstorage-persistent_gles3 read: skip
-spec/arb_buffer_storage/bufferstorage-persistent_gles3 read client-storage: skip
-spec/arb_buffer_storage/bufferstorage-persistent_gles3 read coherent: skip
-spec/arb_buffer_storage/bufferstorage-persistent_gles3 read coherent client-storage: skip
 spec/arb_clear_texture/arb_clear_texture-multisample: skip
-spec/arb_compute_shader/api_errors: skip
-spec/arb_compute_shader/built-in constants: skip
-spec/arb_compute_shader/compiler/work_group_size_too_large: skip
 spec/arb_compute_shader/display-list: skip
-spec/arb_compute_shader/indirect-compute: skip
-spec/arb_compute_shader/local-id-explosion: skip
-spec/arb_compute_shader/minmax: skip
-spec/arb_compute_shader/render-and-compute: skip
-spec/arb_compute_shader/zero-dispatch-size: skip
 spec/arb_compute_variable_group_size/errors: skip
 spec/arb_compute_variable_group_size/local-size: skip
 spec/arb_compute_variable_group_size/minmax: skip
@@ -477,7 +461,6 @@ spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 d=z32f_s8_s=z24_s8
 spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 d=z32f_s=z24_s8: skip
 spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 s=z24_s8_d=z32f: skip
 spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 s=z24_s8_d=z32f_s8: skip
-spec/arb_direct_state_access/create-programpipelines/default compute shader program == 0: skip
 spec/arb_direct_state_access/create-programpipelines/default tcs == 0: skip
 spec/arb_direct_state_access/create-programpipelines/default tes == 0: skip
 spec/arb_direct_state_access/getcompressedtextureimage: skip
@@ -521,7 +504,6 @@ spec/arb_indirect_parameters/tf-count-arrays: skip
 spec/arb_indirect_parameters/tf-count-elements: skip
 spec/arb_internalformat_query/minmax: skip
 spec/arb_internalformat_query/misc. api error checks: skip
-spec/arb_pipeline_statistics_query/arb_pipeline_statistics_query-comp: skip
 spec/arb_pipeline_statistics_query/arb_pipeline_statistics_query-frag: fail
 spec/arb_pixel_buffer_object/cubemap npot pbo: fail
 spec/arb_pixel_buffer_object/cubemap pbo: fail
@@ -529,19 +511,13 @@ spec/arb_post_depth_coverage/arb_post_depth_coverage-basic: skip
 spec/arb_post_depth_coverage/arb_post_depth_coverage-multisampling: skip
 spec/arb_post_depth_coverage/arb_post_depth_coverage-sample-shading: skip
 spec/arb_program_interface_query/arb_program_interface_query-getprogramresourceindex/'vs_input2[1][0]' on gl_program_input: fail
-spec/arb_program_interface_query/arb_program_interface_query-getprogramresourceiv/compute on gl_compute_subroutine_uniform: skip
 spec/arb_program_interface_query/arb_program_interface_query-getprogramresourceiv/tcs_patch on gl_program_output: skip
 spec/arb_program_interface_query/arb_program_interface_query-getprogramresourceiv/tess_control on gl_tess_control_subroutine_uniform: skip
-spec/arb_program_interface_query/arb_program_interface_query-resource-location/test_subroutine_stages_compute: skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-location/test_subroutine_stages_tcs_tes: skip
-spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_compute_subroutine: skip
-spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_compute_subroutine_uniform: skip
-spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_input(cs): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_input(tcs): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_input(tcs,tes): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_input(tes): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_input(vs,tcs,tes): skip
-spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_output(cs): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_output(tcs): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_output(tcs,tes): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_program_output(tcs,tes,gs): skip
@@ -550,17 +526,8 @@ spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_t
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_tess_control_subroutine_uniform: skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_tess_evaluation_subroutine: skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_tess_evaluation_subroutine_uniform: skip
-spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_uniform(cs): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_uniform(tes,tcs): skip
-spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_uniform_block(cs): skip
 spec/arb_program_interface_query/arb_program_interface_query-resource-query/gl_uniform_block(tcs,tes): skip
-spec/arb_query_buffer_object/coherency/index-buffer-gl_compute_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/index-buffer-gl_fragment_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/index-buffer-gl_geometry_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/index-buffer-gl_geometry_shader_primitives_emitted: skip
-spec/arb_query_buffer_object/coherency/index-buffer-gl_primitives_generated: skip
-spec/arb_query_buffer_object/coherency/index-buffer-gl_primitives_submitted: skip
-spec/arb_query_buffer_object/coherency/index-buffer-gl_samples_passed: skip
 spec/arb_query_buffer_object/coherency/index-buffer-gl_tess_control_shader_patches: skip
 spec/arb_query_buffer_object/coherency/index-buffer-gl_tess_evaluation_shader_invocations: skip
 spec/arb_query_buffer_object/coherency/index-buffer-gl_time_elapsed: skip
@@ -568,17 +535,6 @@ spec/arb_query_buffer_object/coherency/index-buffer-gl_timestamp: skip
 spec/arb_query_buffer_object/coherency/index-buffer-gl_transform_feedback_primitives_written: skip
 spec/arb_query_buffer_object/coherency/index-buffer-gl_vertex_shader_invocations: skip
 spec/arb_query_buffer_object/coherency/index-buffer-gl_vertices_submitted: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_any_samples_passed: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_any_samples_passed_conservative: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_clipping_input_primitives: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_clipping_output_primitives: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_compute_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_fragment_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_geometry_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_geometry_shader_primitives_emitted: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_primitives_generated: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_primitives_submitted: skip
-spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_samples_passed: skip
 spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_tess_control_shader_patches: skip
 spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_tess_evaluation_shader_invocations: skip
 spec/arb_query_buffer_object/coherency/indirect-dispatch-gl_transform_feedback_primitives_written: skip
@@ -602,13 +558,6 @@ spec/arb_query_buffer_object/coherency/indirect-draw-count-gl_timestamp: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-count-gl_transform_feedback_primitives_written: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-count-gl_vertex_shader_invocations: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-count-gl_vertices_submitted: skip
-spec/arb_query_buffer_object/coherency/indirect-draw-gl_compute_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/indirect-draw-gl_fragment_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/indirect-draw-gl_geometry_shader_invocations: skip
-spec/arb_query_buffer_object/coherency/indirect-draw-gl_geometry_shader_primitives_emitted: skip
-spec/arb_query_buffer_object/coherency/indirect-draw-gl_primitives_generated: skip
-spec/arb_query_buffer_object/coherency/indirect-draw-gl_primitives_submitted: skip
-spec/arb_query_buffer_object/coherency/indirect-draw-gl_samples_passed: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-gl_tess_control_shader_patches: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-gl_tess_evaluation_shader_invocations: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-gl_time_elapsed: skip
@@ -616,21 +565,6 @@ spec/arb_query_buffer_object/coherency/indirect-draw-gl_timestamp: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-gl_transform_feedback_primitives_written: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-gl_vertex_shader_invocations: skip
 spec/arb_query_buffer_object/coherency/indirect-draw-gl_vertices_submitted: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async-gl_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async-gl_unsigned_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async-gl_unsigned_int64_arb: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async_cpu_read_after-gl_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async_cpu_read_after-gl_unsigned_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async_cpu_read_after-gl_unsigned_int64_arb: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async_cpu_read_before-gl_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async_cpu_read_before-gl_unsigned_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-async_cpu_read_before-gl_unsigned_int64_arb: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-sync-gl_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-sync-gl_unsigned_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-sync-gl_unsigned_int64_arb: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-sync_cpu_read_after_cache_test-gl_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-sync_cpu_read_after_cache_test-gl_unsigned_int: skip
-spec/arb_query_buffer_object/qbo/query-gl_compute_shader_invocations-sync_cpu_read_after_cache_test-gl_unsigned_int64_arb: skip
 spec/arb_query_buffer_object/qbo/query-gl_tess_control_shader_patches-async-gl_int: skip
 spec/arb_query_buffer_object/qbo/query-gl_tess_control_shader_patches-async-gl_unsigned_int: skip
 spec/arb_query_buffer_object/qbo/query-gl_tess_control_shader_patches-async-gl_unsigned_int64_arb: skip
@@ -759,6 +693,7 @@ spec/arb_shader_draw_parameters/drawid-vertexid: skip
 spec/arb_shader_draw_parameters/vertexid-zerobased: skip
 spec/arb_shader_draw_parameters/vertexid-zerobased-indirect: skip
 spec/arb_shader_image_load_store/early-z/occlusion query test/early-z pass: fail
+spec/arb_shader_image_load_store/indexing/compute shader/dynamically uniform indexing test: fail
 spec/arb_shader_image_load_store/indexing/fragment shader/dynamically uniform indexing test: fail
 spec/arb_shader_image_load_store/indexing/geometry shader/dynamically uniform indexing test: fail
 spec/arb_shader_image_load_store/indexing/vertex shader/dynamically uniform indexing test: fail
@@ -788,6 +723,7 @@ spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/r
 spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/rg8i: fail
 spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/rg8ui: fail
 spec/arb_shader_image_load_store/max-images/combined max image uniforms test: fail
+spec/arb_shader_image_load_store/max-images/compute shader max image uniforms test: fail
 spec/arb_shader_image_load_store/max-images/fragment shader max image uniforms test: fail
 spec/arb_shader_image_load_store/max-images/geometry shader max image uniforms test: fail
 spec/arb_shader_image_load_store/max-images/vertex shader max image uniforms test: fail
@@ -1368,7 +1304,6 @@ spec/egl 1.4/egl-blob-cache: skip
 spec/egl 1.4/egl-context-priority: skip
 spec/egl 1.4/egl-copy-buffers: fail
 spec/egl 1.4/egl-flush-external: skip
-spec/egl 1.4/egl-gl_oes_egl_image: skip
 spec/egl 1.4/egl-invalid-attr: skip
 spec/egl 1.4/eglcreatepbuffersurface with egl_samples set: skip
 spec/egl_android_native_fence_sync/egl_khr_fence_sync android_native/eglclientwaitsynckhr_native_zero_timeout: skip
@@ -2061,7 +1996,6 @@ spec/ext_packed_float/multisample-formats 32 gl_ext_packed_float: skip
 spec/ext_packed_float/multisample-formats 4 gl_ext_packed_float: skip
 spec/ext_packed_float/multisample-formats 6 gl_ext_packed_float: skip
 spec/ext_packed_float/multisample-formats 8 gl_ext_packed_float: skip
-spec/ext_render_snorm/render: skip
 spec/ext_semaphore/api-errors: skip
 spec/ext_semaphore_fd/api-errors: skip
 spec/ext_shader_image_load_store/bind_image_error: skip
@@ -2091,7 +2025,6 @@ spec/ext_texture_integer/multisample-formats 32 gl_ext_texture_integer: skip
 spec/ext_texture_integer/multisample-formats 4 gl_ext_texture_integer: skip
 spec/ext_texture_integer/multisample-formats 6 gl_ext_texture_integer: skip
 spec/ext_texture_integer/multisample-formats 8 gl_ext_texture_integer: skip
-spec/ext_texture_norm16/render: skip
 spec/ext_texture_snorm/multisample-formats 16 gl_ext_texture_snorm: skip
 spec/ext_texture_snorm/multisample-formats 2 gl_ext_texture_snorm: skip
 spec/ext_texture_snorm/multisample-formats 32 gl_ext_texture_snorm: skip
@@ -2159,7 +2092,6 @@ spec/glsl-1.50/execution/texturesize/tes-texturesize-usamplerbuffer: skip
 spec/glsl-1.50/execution/texturesize/tes-texturesize-usamplercube: skip
 spec/glsl-1.50/gs-max-output: fail
 spec/glsl-es-3.00/execution/varying-struct-centroid_gles3: fail
-spec/glsl-es-3.10/built-in constants: skip
 spec/intel_blackhole_render/intel_blackhole-dispatch: skip
 spec/intel_blackhole_render/intel_blackhole-draw: skip
 spec/intel_blackhole_render/intel_blackhole-draw_gles2: skip
@@ -2174,7 +2106,8 @@ spec/intel_conservative_rasterization/intel_conservative_rasterization-tri: skip
 spec/intel_conservative_rasterization/intel_conservative_rasterization-tri_gles3: skip
 spec/khr_texture_compression_astc/array-gl/12x12 block dim: fail
 spec/khr_texture_compression_astc/array-gl/5x5 block dim: fail
-spec/khr_texture_compression_astc/array-gles: skip
+spec/khr_texture_compression_astc/array-gles/12x12 block dim: fail
+spec/khr_texture_compression_astc/array-gles/5x5 block dim: fail
 spec/khr_texture_compression_astc/miptree-gl hdr/hdr: notrun
 spec/khr_texture_compression_astc/miptree-gl ldr/ldr: notrun
 spec/khr_texture_compression_astc/miptree-gl ldr/ldr profile: fail
@@ -2213,7 +2146,6 @@ spec/nv_fragment_program_option/fp-condition_codes-01: skip
 spec/nv_fragment_program_option/fp-rfl: skip
 spec/nv_fragment_program_option/fp-set-02: skip
 spec/nv_fragment_program_option/fp-unpack-01: skip
-spec/nv_image_formats/nv_image_formats-gles3: skip
 spec/nv_texture_barrier/arb_texture_barrier-texture-halves-ping-pong-operation-chain: skip
 spec/nv_texture_barrier/blending-in-shader: skip
 spec/nv_vertex_program2_option/vp-address-03: skip
@@ -2223,7 +2155,6 @@ spec/nv_vertex_program2_option/vp-clipdistance-01: skip
 spec/nv_vertex_program2_option/vp-clipdistance-02: skip
 spec/nv_vertex_program2_option/vp-clipdistance-03: skip
 spec/nv_vertex_program2_option/vp-clipdistance-04: skip
-spec/oes_geometry_shader/built-in constants: skip
 spec/oes_matrix_get/all queries: skip
 spec/oes_texture_compression_astc/miptree-3d-gl hdr: skip
 spec/oes_texture_compression_astc/miptree-3d-gl ldr: skip
@@ -2231,24 +2162,61 @@ spec/oes_texture_compression_astc/miptree-3d-gl srgb: skip
 spec/oes_texture_compression_astc/miptree-3d-gles hdr: skip
 spec/oes_texture_compression_astc/miptree-3d-gles ldr: skip
 spec/oes_texture_compression_astc/miptree-3d-gles srgb: skip
-spec/oes_texture_view/clear-into-view-2d: skip
-spec/oes_texture_view/clear-into-view-2d-array: skip
 spec/oes_texture_view/clear-into-view-layered: skip
-spec/oes_texture_view/copytexsubimage-layers: skip
-spec/oes_texture_view/formats: skip
-spec/oes_texture_view/immutable_levels: skip
-spec/oes_texture_view/queries: skip
-spec/oes_texture_view/rendering-formats: skip
-spec/oes_texture_view/rendering-layers: skip
-spec/oes_texture_view/rendering-levels: skip
-spec/oes_texture_view/rendering-target: skip
-spec/oes_texture_view/sampling-2d-array-as-2d-layer: skip
-spec/oes_texture_view/sampling-2d-array-as-cubemap: skip
+spec/oes_texture_view/rendering-formats/clear gl_r8 as gl_r8_snorm: fail
+spec/oes_texture_view/rendering-formats/clear gl_r8 as gl_r8i: fail
+spec/oes_texture_view/rendering-formats/clear gl_rg8 as gl_r16_snorm: fail
+spec/oes_texture_view/rendering-formats/clear gl_rg8 as gl_r16f: fail
+spec/oes_texture_view/rendering-formats/clear gl_rg8 as gl_r16i: fail
+spec/oes_texture_view/rendering-formats/clear gl_rg8 as gl_rg8_snorm: fail
+spec/oes_texture_view/rendering-formats/clear gl_rg8 as gl_rg8i: fail
+spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_r32f: fail
+spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_r32i: fail
+spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rg16_snorm: fail
+spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rg16f: fail
+spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rg16i: fail
+spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rgba8_snorm: fail
+spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rgba8i: fail
+spec/oes_texture_view/rendering-formats/clear gl_rgba8_snorm as gl_r32f: fail
+spec/oes_texture_view/rendering-formats/render to gl_rgb16 as gl_rgb16f: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16 as gl_rgb16i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16 as gl_rgb16ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16_snorm as gl_rgb16f: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16_snorm as gl_rgb16i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16_snorm as gl_rgb16ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16f as gl_rgb16f: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16f as gl_rgb16i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16f as gl_rgb16ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16i as gl_rgb16f: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16i as gl_rgb16i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16i as gl_rgb16ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16ui as gl_rgb16f: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16ui as gl_rgb16i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb16ui as gl_rgb16ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32f as gl_rgb32f: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32f as gl_rgb32i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32f as gl_rgb32ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32i as gl_rgb32f: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32i as gl_rgb32i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32i as gl_rgb32ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32ui as gl_rgb32f: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32ui as gl_rgb32i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb32ui as gl_rgb32ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8 as gl_rgb8_snorm: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8 as gl_rgb8i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8 as gl_rgb8ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8_snorm as gl_rgb8_snorm: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8_snorm as gl_rgb8i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8_snorm as gl_rgb8ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8i as gl_rgb8_snorm: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8i as gl_rgb8i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8i as gl_rgb8ui: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8ui as gl_rgb8_snorm: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8ui as gl_rgb8i: skip
+spec/oes_texture_view/rendering-formats/render to gl_rgb8ui as gl_rgb8ui: skip
 spec/oes_texture_view/sampling-2d-array-as-cubemap-array: skip
 spec/oes_texture_view/targets: skip
-spec/oes_texture_view/texsubimage-layers: skip
 spec/oes_texture_view/texsubimage-layers pbo: skip
-spec/oes_texture_view/texsubimage-levels: skip
 spec/oes_texture_view/texsubimage-levels pbo: skip
 spec/oes_viewport_array/bounds: skip
 spec/oes_viewport_array/clear: skip
@@ -2268,10 +2236,10 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    17799
-       fail:      218
+       pass:    19287
+       fail:      237
       crash:        2
-       skip:     2027
+       skip:     1976
     timeout:        0
        warn:        2
  incomplete:        0
@@ -2280,4 +2248,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    20066
+      total:    21522
diff --git a/.gitlab-ci/piglit/quick_shader.txt b/.gitlab-ci/piglit/quick_shader.txt
index 3bf5a2c3d7c..2885e8a254b 100644
--- a/.gitlab-ci/piglit/quick_shader.txt
+++ b/.gitlab-ci/piglit/quick_shader.txt
@@ -114,39 +114,6 @@ spec/arb_bindless_texture/linker/global_bindless_sampler_and_bindless_image: ski
 spec/arb_bindless_texture/linker/global_bindless_sampler_and_bound_image: skip
 spec/arb_bindless_texture/linker/global_bindless_sampler_and_bound_sampler: skip
 spec/arb_bindless_texture/linker/global_bound_sampler_and_bound_image: skip
-spec/arb_compute_shader/execution/atomic-counter: skip
-spec/arb_compute_shader/execution/basic-global-id: skip
-spec/arb_compute_shader/execution/basic-group-id: skip
-spec/arb_compute_shader/execution/basic-group-id-x: skip
-spec/arb_compute_shader/execution/basic-group-id-y: skip
-spec/arb_compute_shader/execution/basic-group-id-z: skip
-spec/arb_compute_shader/execution/basic-local-id-atomic: skip
-spec/arb_compute_shader/execution/basic-local-index: skip
-spec/arb_compute_shader/execution/basic-ssbo: skip
-spec/arb_compute_shader/execution/basic-texelfetch: skip
-spec/arb_compute_shader/execution/basic-uniform-access: skip
-spec/arb_compute_shader/execution/basic-uniform-access-atomic: skip
-spec/arb_compute_shader/execution/border-color: skip
-spec/arb_compute_shader/execution/multiple-texture-reading: skip
-spec/arb_compute_shader/execution/multiple-workgroups: skip
-spec/arb_compute_shader/execution/separate-global-id: skip
-spec/arb_compute_shader/execution/separate-global-id-2: skip
-spec/arb_compute_shader/execution/shared-atomicadd-int: skip
-spec/arb_compute_shader/execution/shared-atomiccompswap-int: skip
-spec/arb_compute_shader/execution/shared-atomicexchange-int: skip
-spec/arb_compute_shader/execution/shared-atomicmax-int: skip
-spec/arb_compute_shader/execution/shared-atomicmax-uint: skip
-spec/arb_compute_shader/execution/shared-atomicmin-int: skip
-spec/arb_compute_shader/execution/shared-atomicmin-uint: skip
-spec/arb_compute_shader/execution/shared-atomics: skip
-spec/arb_compute_shader/execution/simple-barrier: skip
-spec/arb_compute_shader/execution/simple-barrier-atomics: skip
-spec/arb_compute_shader/linker/bug-93840: skip
-spec/arb_compute_shader/linker/matched_local_work_sizes: skip
-spec/arb_compute_shader/linker/mismatched_local_work_sizes: skip
-spec/arb_compute_shader/linker/mix_compute_and_non_compute: skip
-spec/arb_compute_shader/linker/no_local_work_size: skip
-spec/arb_compute_shader/linker/one_local_work_size: skip
 spec/arb_compute_variable_group_size/execution/basic-local-size: skip
 spec/arb_compute_variable_group_size/execution/fixed-local-size: skip
 spec/arb_compute_variable_group_size/execution/global-invocation-id: skip
@@ -6386,13 +6353,8 @@ spec/glsl-4.40/execution/fs-interpolateatoffset-swizzle: skip
 spec/glsl-4.40/execution/fs-interpolateatsample-swizzle: skip
 spec/glsl-4.50/execution/helper-invocation: skip
 spec/glsl-4.50/execution/ssbo-atomiccompswap-int: skip
-spec/glsl-es-3.10/execution/cs-image-atomic-if-else: skip
-spec/glsl-es-3.10/execution/cs-image-atomic-if-else-2: skip
-spec/glsl-es-3.10/execution/cs-image-load-if-else: skip
-spec/glsl-es-3.10/execution/cs-nir-scheduler-load-shared-regression-check: skip
-spec/glsl-es-3.10/execution/fs-atomic-counter-layout: skip
-spec/glsl-es-3.10/execution/fs-simple-atomic-counter-inc-dec-read: skip
-spec/glsl-es-3.10/execution/vs-simple-atomic-counter-inc-dec-read: skip
+spec/glsl-es-3.10/execution/cs-nir-scheduler-load-shared-regression-check: fail
+spec/glsl-es-3.10/execution/vs-simple-atomic-counter-inc-dec-read: fail
 spec/intel_shader_atomic_float_minmax/execution/shared-atomiccompswap-float: skip
 spec/intel_shader_atomic_float_minmax/execution/shared-atomicexchange-float: skip
 spec/intel_shader_atomic_float_minmax/execution/shared-atomicmax-float: skip
@@ -6438,10 +6400,10 @@ spec/oes_viewport_array/viewport-gs-writes-out-of-range: skip
 summary:
        name:  results
        ----  --------
-       pass:     7382
-       fail:       51
+       pass:     7420
+       fail:       53
       crash:        0
-       skip:     6386
+       skip:     6346
     timeout:        0
        warn:        0
  incomplete:        0