summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCollabora's Gfx CI Team <gfx-ci-bot-collabora@contact.daniels.if.required.fdo.invalid>2024-07-28 00:03:57 +0000
committerCollabora's Gfx CI Team <gfx-ci-bot-collabora@contact.daniels.if.required.fdo.invalid>2024-08-21 00:04:58 +0000
commit7b8e8306449a34b5940688efe745ef64b10f49bc (patch)
treeaabda95b6ece7d1f8e4b9cf07c03336fe8b8f6c8
parent4fc19d919fafba78d8578708da5c1e9fecfabf40 (diff)
https://gitlab.freedesktop.org/mesa/mesa/-/compare/da47c0ed65c38ca0f8015baad03973281be02419...8ee7f8964132128aa0be54c9703b3c0ec9a46363 Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1410>
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--.gitlab-ci/expectations/host/virgl-gl-fails.txt19
-rw-r--r--.gitlab-ci/expectations/host/virgl-gles-fails.txt20
-rw-r--r--.gitlab-ci/expectations/virt/venus-flakes.txt4
-rw-r--r--.gitlab-ci/expectations/virt/virgl-gl-fails.txt1
5 files changed, 42 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58637d6..a739237 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: 1227650
+ MESA_PIPELINE_ID: 1253774
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: da47c0ed65c38ca0f8015baad03973281be02419
+ ref: 8ee7f8964132128aa0be54c9703b3c0ec9a46363
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 648085c..b186308 100644
--- a/.gitlab-ci/expectations/host/virgl-gl-fails.txt
+++ b/.gitlab-ci/expectations/host/virgl-gl-fails.txt
@@ -453,7 +453,6 @@ spec@!opengl 2.0@gl-2.0-edgeflag,Fail
spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail
spec@!opengl 3.2@layered-rendering@clear-color-mismatched-layer-count,Fail
spec@!opengl 1.1@line-smooth-stipple,Fail
-spec@arb_pipeline_statistics_query@arb_pipeline_statistics_query-frag,Fail
spec@arb_gl_spirv@execution@ssbo@unsized-array,Fail
spec@arb_viewport_array@display-list,Fail
@@ -489,5 +488,23 @@ spec@arb_texture_float@texwrap formats bordercolor@GL_RGB32F- border color only,
spec@arb_texture_float@texwrap formats bordercolor@GL_LUMINANCE_ALPHA16F_ARB- border color only,Fail
# uprev Mesa in virglrenderer
+spec@!opengl 1.1@depthstencil-default_fb-blit samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-blit samples=4,Fail
+spec@!opengl 1.1@depthstencil-default_fb-clear samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-clear samples=4,Fail
+spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=4,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-24_8 samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-24_8 samples=4,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-32f_24_8_rev samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-32f_24_8_rev samples=4,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=4,Fail
+spec@arb_texture_cube_map@copyteximage cube samples=2,Fail
+spec@arb_texture_cube_map@copyteximage cube samples=4,Fail
+spec@ext_texture_array@copyteximage 1d_array samples=2,Fail
+spec@ext_texture_array@copyteximage 1d_array samples=4,Fail
+spec@ext_texture_array@copyteximage 2d_array samples=2,Fail
+spec@ext_texture_array@copyteximage 2d_array samples=4,Fail
spec@glsl-1.40@uniform_buffer@two-stages,Fail
diff --git a/.gitlab-ci/expectations/host/virgl-gles-fails.txt b/.gitlab-ci/expectations/host/virgl-gles-fails.txt
index ad87e18..2a8ce8c 100644
--- a/.gitlab-ci/expectations/host/virgl-gles-fails.txt
+++ b/.gitlab-ci/expectations/host/virgl-gles-fails.txt
@@ -3086,13 +3086,29 @@ spec@arb_texture_float@texwrap formats bordercolor@GL_RGB32F- border color only,
spec@arb_texture_float@texwrap formats bordercolor@GL_LUMINANCE_ALPHA16F_ARB- border color only,Fail
# uprev Mesa in Virglrenderer
-spec@glsl-1.40@uniform_buffer@two-stages,Fail
-
+spec@!opengl 1.1@depthstencil-default_fb-clear samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-clear samples=4,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-24_8 samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-24_8 samples=4,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-32f_24_8_rev samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-32f_24_8_rev samples=4,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=2,Fail
+spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=4,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@arb_texture_cube_map@copyteximage cube samples=2,Fail
+spec@arb_texture_cube_map@copyteximage cube samples=4,Fail
+spec@arb_texture_rectangle@copyteximage rect samples=2,Fail
+spec@arb_texture_rectangle@copyteximage rect samples=4,Fail
+spec@ext_texture_array@copyteximage 1d_array samples=2,Fail
+spec@ext_texture_array@copyteximage 1d_array samples=4,Fail
+spec@ext_texture_array@copyteximage 2d_array samples=2,Fail
+spec@ext_texture_array@copyteximage 2d_array samples=4,Fail
+spec@glsl-1.40@uniform_buffer@two-stages,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/virt/venus-flakes.txt b/.gitlab-ci/expectations/virt/venus-flakes.txt
index 083f3be..d4b680c 100644
--- a/.gitlab-ci/expectations/virt/venus-flakes.txt
+++ b/.gitlab-ci/expectations/virt/venus-flakes.txt
@@ -11,3 +11,7 @@ dEQP-VK.transform_feedback.primitives_generated_query.get.*reset.*
dEQP-VK.binding_model.mutable_descriptor.multiple_arrays_mixed.constant_size.aliasing.update_write.no_source.no_source.pool_no_types.pre_update.index_constant.comp
dEQP-VK.binding_model.mutable_descriptor.multiple_arrays_mixed.unbounded.noaliasing.update_write.no_source.no_source.*
dEQP-VK.pipeline.monolithic.timestamp.calibrated.calibration_test
+
+# uprev Mesa in Virglrenderer
+dEQP-VK.api.info.image_format_properties2.2d.linear.g16b16g16r16_422_unorm
+
diff --git a/.gitlab-ci/expectations/virt/virgl-gl-fails.txt b/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
index f5e7118..a0b9595 100644
--- a/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
+++ b/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
@@ -509,7 +509,6 @@ spec@!opengl 2.0@vertex-program-two-side front back@gs-out and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front front2 back2@gs-out and fs,Fail
spec@!opengl 3.2@layered-rendering@clear-color-mismatched-layer-count,Fail
spec@!opengl 1.1@line-smooth-stipple,Fail
-spec@arb_pipeline_statistics_query@arb_pipeline_statistics_query-frag,Fail
spec@arb_gl_spirv@execution@xfb@vs_two_block,Timeout
spec@arb_gl_spirv@execution@xfb@vs_two_sets_ifc,Fail