ci: Bump the GLES CTS version to 3.2.6.1.

This brings in the surfaceless fixes so we don't need to check out the
whole repo to cherry pick any more (which was bothering me as I debugged
things late in the painfully slow ARM container build process).

Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3662>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3662>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 508ae0df36a02731fab90d3104518e57fe89ddd9..571d6601cbef67be9477eb7c8d938fb8c27a027d 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,7 +125,7 @@ x86_build:
 x86_test-gl:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-gl "2020-01-14"
+    DEBIAN_TAG: &x86_test-gl "2020-01-30"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -165,7 +165,7 @@ arm_build:
     - .debian@container-ifnot-exists@arm64v8
     - .container
   variables:
-    DEBIAN_TAG: &arm_build "2020-02-03"
+    DEBIAN_TAG: &arm_build "2020-02-05"
 
 .use-arm_build:
   variables:
@@ -178,7 +178,7 @@ arm_build:
 arm_test:
   extends: arm_build
   variables:
-    DEBIAN_TAG: &arm_test "2019-12-18"
+    DEBIAN_TAG: &arm_test "2020-01-30"
 
 .use-arm_test:
   variables:

diff --git a/.gitlab-ci/build-deqp-gl.sh b/.gitlab-ci/build-deqp-gl.sh
index 63164956f0c8bd4ffc3fbe1354a03cc34a231af2..13c684b31a6b427f5d74f085edad5b6088a426a3 100644 (file)
--- a/.gitlab-ci/build-deqp-gl.sh
+++ b/.gitlab-ci/build-deqp-gl.sh
@@ -1,14 +1,11 @@
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
-# XXX: Use --depth 1 once we can drop the cherry-picks.
 git clone \
+    --depth 1 \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b opengl-es-cts-3.2.5.1 \
+    -b opengl-es-cts-3.2.6.1 \
     /VK-GL-CTS
 pushd /VK-GL-CTS
-# Fix surfaceless build
-git cherry-pick -x 22f41e5e321c6dcd8569c4dad91bce89f06b3670
-git cherry-pick -x 1daa8dff73161ea60ead965bd6c9f2a0a2165648
 
 # surfaceless links against libkms and such despite not using it.
 sed -i '/gbm/d' targets/surfaceless/surfaceless.cmake
@@ -38,7 +35,7 @@ ninja
 mkdir /deqp/mustpass
 for gles in gles2 gles3 gles31; do
     cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.5.x/$gles-master.txt \
+        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/$gles-master.txt \
         /deqp/mustpass/$gles-master.txt
 done
 

diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh
index a24d81ea9727fc86375ec6ff6e996f18e2037ff5..b7f0b5942ae7511c319da385a843399d730a48fd 100644 (file)
--- a/.gitlab-ci/container/arm_build.sh
+++ b/.gitlab-ci/container/arm_build.sh
@@ -41,6 +41,7 @@ apt-get -y install \
        meson \
        pkg-config \
        python \
+       python3-distutils \
        python3-mako \
        unzip \
        wget \
@@ -69,6 +70,7 @@ DEBIAN_ARCH=arm64 . .gitlab-ci/container/lava_arm.sh
 DEBIAN_ARCH=armhf . .gitlab-ci/container/lava_arm.sh
 
 apt-get purge -y \
+        python3-distutils \
         wget
 
 apt-get autoremove -y --purge

diff --git a/.gitlab-ci/container/arm_test.sh b/.gitlab-ci/container/arm_test.sh
index a6ef7407ccdc5267aed920d12c5fe6bf35f8d087..6f91da724ab702e2efafbe48df5faea312717cd4 100644 (file)
--- a/.gitlab-ci/container/arm_test.sh
+++ b/.gitlab-ci/container/arm_test.sh
@@ -30,6 +30,7 @@ apt-get -y install \
        pkg-config \
        procps \
        python \
+       python3-distutils \
        waffle-utils \
        wget \
        zlib1g
@@ -59,6 +60,7 @@ apt-get purge -y \
         meson \
         pkg-config \
         python \
+        python3-distutils \
         wget
 
 apt-get autoremove -y --purge

diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index a8fb9889c8d6d1c7a1828db25341811d24f3bd44..961ad2accc6f0afb4d01c8d15e869872b0d5dc1d 100644 (file)
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -50,6 +50,7 @@ apt-get install -y --no-remove \
       meson \
       patch \
       pkg-config \
+      python3-distutils \
       python3-mako \
       python3-numpy \
       python3-six \
@@ -91,6 +92,7 @@ apt-get purge -y \
       meson \
       patch \
       pkg-config \
-      python
+      python \
+      python3-distutils
 
 apt-get autoremove -y --purge

diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/.gitlab-ci/deqp-freedreno-a630-fails.txt
index 4124d0984fe0dc5905cc6d9e89748ca45a8e2a14..61478eb1fef0877195ef1b11a1b5dd34a1249308 100644 (file)
--- a/.gitlab-ci/deqp-freedreno-a630-fails.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-fails.txt
@@ -1,3 +1,4 @@
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z
+dEQP-GLES2.functional.clip_control.depth_mode_zero_to_one
 dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_clear
 dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw

diff --git a/.gitlab-ci/deqp-freedreno-a630-skips.txt b/.gitlab-ci/deqp-freedreno-a630-skips.txt
index 38f0560f6437e38ed2ecac190e5f2ab6c3ff214b..16c8bd70d8db26059e558adf560f7ffd03c92a39 100644 (file)
--- a/.gitlab-ci/deqp-freedreno-a630-skips.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-skips.txt
@@ -18,6 +18,7 @@ dEQP-GLES31.functional.primitive_bounding_box.*
 
 # Intermittent timeout
 dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.23
+dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.48
 
 # Flakes reported more than once during January 2020
 dEQP-GLES31.functional.layout_binding.ssbo.fragment_binding_array

diff --git a/.gitlab-ci/deqp-lima-fails.txt b/.gitlab-ci/deqp-lima-fails.txt
index c85e28b4cc965caec9a8c2a753c9043ea81289b5..2ddd3548250b6d71ec53eaa61c7bdfd72416999d 100644 (file)
--- a/.gitlab-ci/deqp-lima-fails.txt
+++ b/.gitlab-ci/deqp-lima-fails.txt
@@ -4,6 +4,7 @@ dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_x_neg_y_pos_z_a
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_x_pos_y_pos_z_and_pos_x_neg_y_neg_z
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_x_neg_y_pos_z_and_neg_x_pos_y_neg_z
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_x_pos_y_pos_z_and_neg_x_neg_y_neg_z
+dEQP-GLES2.functional.default_vertex_attrib.float.vertex_attrib_1f
 dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked
 dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb565_depth_component16
 dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb565_stencil_index8
@@ -62,6 +63,7 @@ dEQP-GLES2.functional.fragment_ops.depth_stencil.random.8
 dEQP-GLES2.functional.fragment_ops.depth_stencil.random.9
 dEQP-GLES2.functional.fragment_ops.depth_stencil.write_mask.stencil
 dEQP-GLES2.functional.shaders.algorithm.hsl_to_rgb_vertex
+dEQP-GLES2.functional.shaders.builtin_variable.frontfacing
 dEQP-GLES2.functional.shaders.functions.array_arguments.global_in_int_vertex
 dEQP-GLES2.functional.shaders.functions.array_arguments.local_in_int_vertex
 dEQP-GLES2.functional.shaders.functions.datatypes.int_int_vertex

diff --git a/.gitlab-ci/deqp-softpipe-fails.txt b/.gitlab-ci/deqp-softpipe-fails.txt
index a0adbc8108d8d96ead2bba2f1134074584c4ad53..0f3c7faaddc7f5634ac1127bc85c54699bdf5426 100644 (file)
--- a/.gitlab-ci/deqp-softpipe-fails.txt
+++ b/.gitlab-ci/deqp-softpipe-fails.txt
@@ -503,6 +503,7 @@ dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_test
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_tests_stencil_fbo
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_depth
 dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_depth_fbo
+dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_expression.geometry.usampler3d
 dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.dynamically_uniform_geometry
 dEQP-GLES31.functional.state_query.integer.max_framebuffer_samples_getfloat
 dEQP-GLES31.functional.state_query.integer.max_framebuffer_samples_getinteger

diff --git a/.gitlab-ci/deqp-softpipe-skips.txt b/.gitlab-ci/deqp-softpipe-skips.txt
index 5efd9dc7c0bf1f42e7b463d42f26931ee22e8695..61bbda20998b899392452f66eca97b770458abc3 100644 (file)
--- a/.gitlab-ci/deqp-softpipe-skips.txt
+++ b/.gitlab-ci/deqp-softpipe-skips.txt
@@ -11,6 +11,7 @@ dEQP-GLES[0-9]*.functional.flush_finish.*
 
 # Random failures
 dEQP-GLES31.functional.shaders.builtin_functions.*geometry
+dEQP-GLES31.functional.geometry_shading.input.basic_primitive.points
 
 dEQP-GLES31.functional.fbo.no_attachments.maximums.all
 dEQP-GLES31.functional.fbo.no_attachments.maximums.size