aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCollabora's Gfx CI Team <gfx-ci-bot-collabora@contact.daniels.if.required.fdo.invalid>2024-02-08 00:05:00 +0000
committerMarge Bot <emma+marge@anholt.net>2024-03-05 20:53:37 +0000
commit69495348d1d6d8ea69488463c5c42b809f309d8b (patch)
tree0b55de056d557ee63a2cebd6ff8607dfbf1a1968
parent082915db782569efcf90f89fb844e42850034992 (diff)
downloadvirglrenderer-69495348d1d6d8ea69488463c5c42b809f309d8b.tar.gz
Uprev Mesa to 5a852bd24cc10e08e42703751e7d1ba384b76e31
https://gitlab.freedesktop.org/mesa/mesa/-/compare/8368a972943d5265b22eab86aa17c9a3cfe3406b...5a852bd24cc10e08e42703751e7d1ba384b76e31 Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1337>
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--.gitlab-ci/expectations/host/virgl-gles-fails.txt10
-rw-r--r--.gitlab-ci/expectations/host/virgl-gles-skips.txt1
-rw-r--r--.gitlab-ci/expectations/virt/virgl-gles-fails.txt10
-rw-r--r--.gitlab-ci/expectations/virt/virgl-gles-flakes.txt1
-rw-r--r--.gitlab-ci/expectations/virt/virgl-gles-skips.txt1
6 files changed, 21 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70fec9b1..e4155209 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
#
# Pick a pipeline on https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/
#
- MESA_PIPELINE_ID: 1094474
+ MESA_PIPELINE_ID: 1118410
MESA_PROJECT_PATH: mesa/mesa
STORAGE_HOST: s3.freedesktop.org
CI_REGISTRY_IMAGE: "registry.freedesktop.org/${MESA_PROJECT_PATH}"
@@ -43,7 +43,7 @@ include:
# 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: 8368a972943d5265b22eab86aa17c9a3cfe3406b
+ ref: 5a852bd24cc10e08e42703751e7d1ba384b76e31
file:
- '/.gitlab-ci/image-tags.yml'
diff --git a/.gitlab-ci/expectations/host/virgl-gles-fails.txt b/.gitlab-ci/expectations/host/virgl-gles-fails.txt
index 11b58c82..6a05d30c 100644
--- a/.gitlab-ci/expectations/host/virgl-gles-fails.txt
+++ b/.gitlab-ci/expectations/host/virgl-gles-fails.txt
@@ -275,8 +275,6 @@ spec@arb_texture_compression@texwrap formats bordercolor-swizzled@GL_COMPRESSED_
spec@arb_texture_compression@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGB- swizzled- border color only,Fail
spec@arb_texture_cube_map_array@arb_texture_cube_map_array-sampler-cube-array-shadow,Fail
spec@arb_texture_cube_map_array@fbo-generatemipmap-cubemap array s3tc_dxt1,Fail
-spec@arb_texture_multisample@arb_texture_multisample-dsa-texelfetch,Fail
-spec@arb_texture_multisample@arb_texture_multisample-dsa-texelfetch@Texture type: GL_RGB9_E5,Fail
spec@arb_texture_query_lod@execution@fs-texturequerylod-nearest-biased,Fail
spec@arb_texture_rectangle@texwrap rect bordercolor,Fail
spec@arb_texture_rectangle@texwrap rect bordercolor@GL_RGBA8- border color only,Fail
@@ -3089,3 +3087,11 @@ spec@arb_texture_float@texwrap formats bordercolor@GL_LUMINANCE_ALPHA16F_ARB- bo
# uprev Mesa in Virglrenderer
spec@glsl-1.40@uniform_buffer@two-stages,Fail
+spec@arb_copy_image@arb_copy_image-formats --samples=2,Fail
+spec@arb_copy_image@arb_copy_image-formats --samples=2@Source: GL_ALPHA/Destination: GL_ALPHA,Fail
+spec@arb_copy_image@arb_copy_image-formats --samples=4,Fail
+spec@arb_copy_image@arb_copy_image-formats --samples=4@Source: GL_ALPHA/Destination: GL_ALPHA,Fail
+spec@nv_copy_image@nv_copy_image-formats --samples=2,Fail
+spec@nv_copy_image@nv_copy_image-formats --samples=2@Source: GL_ALPHA/Destination: GL_ALPHA,Fail
+spec@nv_copy_image@nv_copy_image-formats --samples=4,Fail
+spec@nv_copy_image@nv_copy_image-formats --samples=4@Source: GL_ALPHA/Destination: GL_ALPHA,Fail
diff --git a/.gitlab-ci/expectations/host/virgl-gles-skips.txt b/.gitlab-ci/expectations/host/virgl-gles-skips.txt
index dd056809..335a20ba 100644
--- a/.gitlab-ci/expectations/host/virgl-gles-skips.txt
+++ b/.gitlab-ci/expectations/host/virgl-gles-skips.txt
@@ -165,3 +165,4 @@ spec@arb_shader_image_load_store@level
# Test uses a RGBA8 RW image and this is not supported on GLES
spec@arb_shader_image_load_store@execution@disable_early_z
+spec@arb_texture_multisample@arb_texture_multisample-dsa-texelfetch@Texture type: GL_RGB9_E5
diff --git a/.gitlab-ci/expectations/virt/virgl-gles-fails.txt b/.gitlab-ci/expectations/virt/virgl-gles-fails.txt
index 31811797..ed12f4aa 100644
--- a/.gitlab-ci/expectations/virt/virgl-gles-fails.txt
+++ b/.gitlab-ci/expectations/virt/virgl-gles-fails.txt
@@ -308,8 +308,6 @@ spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_RGB16F- swizzled-
spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_RGB32F- swizzled- border color only,Fail
spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_RGBA16F- swizzled- border color only,Fail
spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_RGBA32F- swizzled- border color only,Fail
-spec@arb_texture_multisample@arb_texture_multisample-dsa-texelfetch,Fail
-spec@arb_texture_multisample@arb_texture_multisample-dsa-texelfetch@Texture type: GL_RGB9_E5,Fail
spec@arb_texture_query_lod@execution@fs-texturequerylod-nearest-biased,Fail
spec@arb_texture_rectangle@texwrap rect bordercolor,Fail
spec@arb_texture_rectangle@texwrap rect bordercolor@GL_RGBA8- border color only,Fail
@@ -3118,3 +3116,11 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_vyuy,Fail
spec@glsl-1.40@uniform_buffer@two-stages,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount-multithread,Fail
+spec@nv_copy_image@nv_copy_image-formats --samples=4,Fail
+spec@nv_copy_image@nv_copy_image-formats --samples=4@Source: GL_ALPHA/Destination: GL_ALPHA,Fail
+spec@arb_copy_image@arb_copy_image-formats --samples=2,Fail
+spec@arb_copy_image@arb_copy_image-formats --samples=2@Source: GL_ALPHA/Destination: GL_ALPHA,Fail
+spec@arb_copy_image@arb_copy_image-formats --samples=4,Fail
+spec@arb_copy_image@arb_copy_image-formats --samples=4@Source: GL_ALPHA/Destination: GL_ALPHA,Fail
+spec@nv_copy_image@nv_copy_image-formats --samples=2,Fail
+spec@nv_copy_image@nv_copy_image-formats --samples=2@Source: GL_ALPHA/Destination: GL_ALPHA,Fail
diff --git a/.gitlab-ci/expectations/virt/virgl-gles-flakes.txt b/.gitlab-ci/expectations/virt/virgl-gles-flakes.txt
index 5d0ef876..f5211820 100644
--- a/.gitlab-ci/expectations/virt/virgl-gles-flakes.txt
+++ b/.gitlab-ci/expectations/virt/virgl-gles-flakes.txt
@@ -159,3 +159,4 @@ spec@!opengl 3.0@gl30basic
spec@arb_get_texture_sub_image@arb_get_texture_sub_image-get
spec@ext_packed_depth_stencil@depthstencil-render-miplevels 585 d=z24_s8
dEQP-GLES31.functional.copy_image.non_compressed.viewclass_32_bits.rg16ui_r32f.texture3d_to_cubemap
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount-multithread
diff --git a/.gitlab-ci/expectations/virt/virgl-gles-skips.txt b/.gitlab-ci/expectations/virt/virgl-gles-skips.txt
index d66f22c1..e0f5afe2 100644
--- a/.gitlab-ci/expectations/virt/virgl-gles-skips.txt
+++ b/.gitlab-ci/expectations/virt/virgl-gles-skips.txt
@@ -180,3 +180,4 @@ spec@arb_shader_image_load_store@execution@disable_early_z
KHR-GL32.transform_feedback_overflow_query_ARB.multiple-streams-multiple-buffers-per-stream
KHR-GL32.transform_feedback_overflow_query_ARB.multiple-streams-one-buffer-per-stream
+spec@arb_texture_multisample@arb_texture_multisample-dsa-texelfetch@Texture type: GL_RGB9_E5