ci: Uprev Mesa to the latest version
This includes a patch disabling SSOs for builtin shaders and a bugfix
for OES_EGL_image_external_essl3.
I also added a few flaky tests to the expectations.
Signed-off-by: Italo Nicola <italonicola@collabora.com>
Reviewed-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/854>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 480fc6a..9a27a93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@
#
# Pick a pipeline on https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/
#
- MESA_PIPELINE_ID: 630937
+ MESA_PIPELINE_ID: 634658
MESA_PROJECT_PATH: mesa/mesa
MINIO_HOST: minio-packet.freedesktop.org
# Per-pipeline artifact storage on MinIO
@@ -32,7 +32,7 @@
# IMPORTANT: Use a recent Mesa Git revision
# The commit ref must be in sync with the pipeline picked above
# It can be found on the pipeline page below the commit message
- ref: d92c1ca01b326d8f0ff210828830d6542f9e67f7
+ ref: 27c57b86500ce48154533d78b74350c31152b2f3
file:
- '/.gitlab-ci/image-tags.yml'
diff --git a/.gitlab-ci/expectations/host/virgl-gl-fails.txt b/.gitlab-ci/expectations/host/virgl-gl-fails.txt
index 0c67c85..dd3f30d 100644
--- a/.gitlab-ci/expectations/host/virgl-gl-fails.txt
+++ b/.gitlab-ci/expectations/host/virgl-gl-fails.txt
@@ -612,9 +612,6 @@
spec@nv_copy_image@nv_copy_image-formats@Source: GL_COMPRESSED_SRGB_S3TC_DXT1_EXT/Destination: GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,Fail
spec@nv_copy_image@nv_copy_image-formats@Source: GL_DEPTH_COMPONENT24/Destination: GL_DEPTH_COMPONENT24,Fail
spec@nv_read_depth@read_depth_gles3,Fail
-spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail
-spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3@oes_egl_image_external_essl3_imageLoad,Fail
-spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3@oes_egl_image_external_essl3_imageStore,Fail
spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail
spec@!opengl 1.0@depth-clear-precision-check,Fail
spec@!opengl 1.0@gl-1.0-dlist-bitmap,Fail
diff --git a/.gitlab-ci/expectations/host/virgl-gles-fails.txt b/.gitlab-ci/expectations/host/virgl-gles-fails.txt
index b92aaac..f99a222 100644
--- a/.gitlab-ci/expectations/host/virgl-gles-fails.txt
+++ b/.gitlab-ci/expectations/host/virgl-gles-fails.txt
@@ -263,7 +263,6 @@
spec@arb_sample_shading@samplemask 4@sample mask_in_one,Fail
spec@arb_seamless_cube_map@arb_seamless_cubemap,Fail
spec@arb_shader_atomic_counters@fragment-discard,Fail
-spec@arb_shader_atomic_counters@function-argument,Fail
spec@arb_shader_image_load_store@early-z,ExpectedFail
spec@arb_shader_image_load_store@early-z@occlusion query test/early-z pass,ExpectedFail
spec@arb_shader_image_load_store@early-z@occlusion query test/late-z pass,Fail
diff --git a/.gitlab-ci/expectations/host/virgl-gles-flakes.txt b/.gitlab-ci/expectations/host/virgl-gles-flakes.txt
index 9463192..5027ae1 100644
--- a/.gitlab-ci/expectations/host/virgl-gles-flakes.txt
+++ b/.gitlab-ci/expectations/host/virgl-gles-flakes.txt
@@ -9,6 +9,7 @@
spec@arb_framebuffer_no_attachments@arb_framebuffer_no_attachments-roundup-samples
spec@arb_get_texture_sub_image@arb_get_texture_sub_image-getcompressed
spec@arb_shader_atomic_counter_ops@execution@add
+spec@arb_shader_atomic_counters@function-argument
spec@arb_shader_image_load_store@atomicity
spec@arb_shader_image_load_store@atomicity@imageAtomicAdd
spec@arb_shader_image_load_store@atomicity@imageAtomicAnd
@@ -29,6 +30,7 @@
spec@arb_shader_image_load_store@host-mem-barrier@Uniform buffer/RaW/full barrier test/4x4
spec@arb_shader_image_load_store@host-mem-barrier@Vertex array/RaW/full barrier test/4x4
spec@arb_shader_storage_buffer_object@execution@memory-layouts-struct-deref
+spec@arb_shader_storage_buffer_object@execution@ssbo-atomicadd-int
spec@arb_shader_storage_buffer_object@execution@ssbo-atomicexchange-int
spec@arb_shader_storage_buffer_object@layout-std140-write-shader
spec@arb_shader_storage_buffer_object@layout-std430-write-shader
diff --git a/.gitlab-ci/expectations/virt/virgl-gl-fails.txt b/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
index a928814..291f25b 100644
--- a/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
+++ b/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
@@ -601,9 +601,6 @@
spec@nv_copy_image@nv_copy_image-formats@Source: GL_COMPRESSED_SRGB_S3TC_DXT1_EXT/Destination: GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,Fail
spec@nv_copy_image@nv_copy_image-formats@Source: GL_DEPTH_COMPONENT24/Destination: GL_DEPTH_COMPONENT24,Fail
spec@nv_read_depth@read_depth_gles3,Fail
-spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail
-spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3@oes_egl_image_external_essl3_imageLoad,Fail
-spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3@oes_egl_image_external_essl3_imageStore,Fail
spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail
spec@!opengl 1.0@depth-clear-precision-check,Fail
spec@!opengl 1.0@gl-1.0-dlist-bitmap,Fail
