From 64ffe0ad25afeaec21c6a95eb5a0bc7bffa80a68 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Wed, 3 Feb 2021 23:35:29 +0200 Subject: [PATCH] ci: build gfxreconstruct v0.9.5 https://github.com/LunarG/gfxreconstruct/issues/328 and https://github.com/LunarG/gfxreconstruct/issues/402 are already fixed in the "master" branch. Updated the piglit version so it supports this version. Additionally, LunarG's VulkanTools are not built any more since GFXReconstruct is now able to generate screenshots on its own without using the VK_LAYER_LUNARG_screenshot layer. v2: - Explain the VulkanTools removal in the commit log (Martin). Signed-off-by: Andres Gomez Reviewed-by: Christian Gmeiner Reviewed-by: Juan A. Suarez Part-of: --- .gitlab-ci.yml | 10 +++---- .gitlab-ci/container/build-gfxreconstruct.sh | 6 ++-- .gitlab-ci/container/build-piglit.sh | 2 +- .gitlab-ci/container/build-vulkantools.sh | 29 ------------------ .gitlab-ci/container/create-rootfs.sh | 1 + .gitlab-ci/container/x86_test-base.sh | 1 + .gitlab-ci/container/x86_test-vk.sh | 11 +------ .gitlab-ci/lava-gitlab-ci.yml | 2 +- .gitlab-ci/piglit/freedreno-a630-shader.txt | 9 +++--- .gitlab-ci/piglit/llvmpipe-glslparser.txt | 31 ++++++++++++++++++-- .gitlab-ci/piglit/llvmpipe-quick_gl.txt | 14 ++++++--- .gitlab-ci/piglit/llvmpipe-quick_shader.txt | 4 +-- .gitlab-ci/piglit/run.sh | 4 --- .gitlab-ci/piglit/softpipe-quick.txt | 15 +++++++--- .gitlab-ci/piglit/vc4-rpi3-quick_gl.txt | 11 +++---- .gitlab-ci/piglit/vc4-rpi3-quick_shader.txt | 7 +++-- .gitlab-ci/piglit/zink-quick_gl.txt | 14 ++++++--- 17 files changed, 90 insertions(+), 81 deletions(-) delete mode 100644 .gitlab-ci/container/build-vulkantools.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ea9fc4f9d0..a2bde71ab28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -384,7 +384,7 @@ android_build: x86_test-base: extends: x86_build-base variables: - MESA_IMAGE_TAG: &x86_test-base "2021-02-17-remove-pytest" + MESA_IMAGE_TAG: &x86_test-base "2021-02-17-gfxreconstruct-master" .use-x86_test-base: extends: @@ -400,13 +400,13 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-gl "2021-02-17-remove-pytest" + MESA_IMAGE_TAG: &x86_test-gl "2021-02-17-gfxreconstruct-master" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-vk "2021-02-17-remove-pytest" + MESA_IMAGE_TAG: &x86_test-vk "2021-02-17-gfxreconstruct-master" # Debian 10 based ARM build image arm_build: @@ -448,7 +448,7 @@ arm64_test: extends: - .use-arm_test-base variables: - MESA_IMAGE_TAG: &arm64_test "2021-02-17-piglit-dependencies" + MESA_IMAGE_TAG: &arm64_test "2021-02-17-gfxreconstruct-master" .use-arm64_test: extends: @@ -465,7 +465,7 @@ armhf_test: extends: - .use-arm_test-base variables: - MESA_IMAGE_TAG: &armhf_test "2021-02-17-piglit-dependencies" + MESA_IMAGE_TAG: &armhf_test "2021-02-17-gfxreconstruct-master" .use-armhf_test: extends: diff --git a/.gitlab-ci/container/build-gfxreconstruct.sh b/.gitlab-ci/container/build-gfxreconstruct.sh index 6b79e9a3f26..59605668926 100644 --- a/.gitlab-ci/container/build-gfxreconstruct.sh +++ b/.gitlab-ci/container/build-gfxreconstruct.sh @@ -2,11 +2,9 @@ set -ex -GFXRECONSTRUCT_VERSION=57c588c04af631d1d6d381a48e2b9283f9d9d528 +GFXRECONSTRUCT_VERSION=3738decc2f4f9ff183818e5ab213a75a79fb7ab1 -# Using the "dev" branch by now because it solves a crash and will allow us to -# use the gfxreconstruct-info tool -git clone https://github.com/LunarG/gfxreconstruct.git --single-branch -b dev --no-checkout /gfxreconstruct +git clone https://github.com/LunarG/gfxreconstruct.git --single-branch -b master --no-checkout /gfxreconstruct pushd /gfxreconstruct git checkout "$GFXRECONSTRUCT_VERSION" git submodule update --init diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 63c26a0e010..904428c00be 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -8,7 +8,7 @@ fi git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit pushd /piglit -git checkout 7e168a62b336dd106f685cd5a4a457ad7c28d501 +git checkout b0bbeb876a506e0ee689dd7e17cee374c8284058 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS ninja $PIGLIT_BUILD_TARGETS diff --git a/.gitlab-ci/container/build-vulkantools.sh b/.gitlab-ci/container/build-vulkantools.sh deleted file mode 100644 index 5924c80d249..00000000000 --- a/.gitlab-ci/container/build-vulkantools.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -set -ex - -VULKANTOOLS_VERSION=1862c6a47b64cd09156205d7f7e6b3bfcea76390 - -git clone https://github.com/LunarG/VulkanTools.git --single-branch --no-checkout /VulkanTools -pushd /VulkanTools -git checkout "$VULKANTOOLS_VERSION" -./update_external_sources.sh -mkdir _build -./scripts/update_deps.py --dir=_build --config=release --generator=Ninja -cmake -S . -B _build -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/VulkanTools/build \ - -DBUILD_TESTS=OFF \ - -DBUILD_VLF=OFF \ - -DBUILD_VKTRACE=OFF \ - -DBUILD_VIA=OFF \ - -DBUILD_VKTRACE_REPLAY=OFF \ - -C_build/helper.cmake -ninja -C _build VkLayer_screenshot VkLayer_screenshot-staging-json -mkdir -p build/etc/vulkan/explicit_layer.d -mkdir build/lib -install _build/layersvt/staging-json/VkLayer_screenshot.json build/etc/vulkan/explicit_layer.d -install _build/layersvt/libVkLayer_screenshot.so build/lib -strip build/lib/* -find . -not -path './build' -not -path './build/*' -delete -popd diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index 6fc750315df..148ffd95a67 100644 --- a/.gitlab-ci/container/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh @@ -33,6 +33,7 @@ if [ -n "$INCLUDE_PIGLIT" ]; then python3-lxml python3-mako python3-numpy + python3-packaging python3-pil python3-requests python3-simplejson diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh index e5f5cc72c79..fbcdcbd4e54 100644 --- a/.gitlab-ci/container/x86_test-base.sh +++ b/.gitlab-ci/container/x86_test-base.sh @@ -53,6 +53,7 @@ apt-get install -y --no-remove \ python \ python3-mako \ python3-numpy \ + python3-packaging \ python3-pil \ python3-requests \ python3-six \ diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index 72d94e7f37c..6c1923eedcd 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -17,6 +17,7 @@ STABLE_EPHEMERAL=" \ libvulkan-dev \ libwaffle-dev \ libxcb-ewmh-dev \ + libxcb-keysyms1-dev \ libxkbcommon-dev \ libxrandr-dev \ libxrender-dev \ @@ -29,15 +30,9 @@ STABLE_EPHEMERAL=" \ wget \ " -# Unfortunately, gfxreconstruct needs the -dev packages: -# https://github.com/LunarG/gfxreconstruct/issues/402 apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ - libwayland-dev \ - libx11-xcb-dev \ - libxcb-keysyms1-dev \ libxcb-shm0 \ - libxcb1-dev \ python3-lxml \ python3-simplejson @@ -132,10 +127,6 @@ rm -rf /root/.rustup /root/.cargo . .gitlab-ci/container/build-gfxreconstruct.sh -############### Build VulkanTools - -. .gitlab-ci/container/build-vulkantools.sh - ############### Uninstall the build software ccache --show-stats diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index d2670d8c014..a34fa2d4bd5 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - MESA_LAVA_TAG: "2020-02-17-piglit-dependencies" + MESA_LAVA_TAG: "2020-02-17-gfxreconstruct-master" .kernel+rootfs: stage: container-2 diff --git a/.gitlab-ci/piglit/freedreno-a630-shader.txt b/.gitlab-ci/piglit/freedreno-a630-shader.txt index 6ab1d5fc4e8..e9db6a7fdbc 100644 --- a/.gitlab-ci/piglit/freedreno-a630-shader.txt +++ b/.gitlab-ci/piglit/freedreno-a630-shader.txt @@ -84,6 +84,8 @@ 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/border-color: fail +spec/arb_compute_shader/execution/min-dvec4-double-large-group-size: skip +spec/arb_derivative_control/execution/derivatives-vs-flat-input: skip spec/arb_derivative_control/execution/dfdx-coarse: skip spec/arb_derivative_control/execution/dfdx-dfdy: skip spec/arb_derivative_control/execution/dfdx-fine: skip @@ -967,7 +969,6 @@ spec/glsl-1.30/execution/interpolation/interpolation-flat-gl_frontsecondarycolor spec/glsl-1.30/execution/interpolation/interpolation-flat-gl_frontsecondarycolor-smooth-fixed: crash spec/glsl-1.30/execution/interpolation/interpolation-flat-gl_frontsecondarycolor-smooth-none: crash spec/glsl-1.30/execution/interpolation/interpolation-flat-gl_frontsecondarycolor-smooth-vertex: crash -spec/glsl-1.40-compat/execution/built-in-constants: skip spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-accept: crash spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-reject: crash spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-different-from-position: crash @@ -1124,10 +1125,10 @@ spec/oes_viewport_array/viewport-gs-writes-out-of-range: skip summary: name: results ---- -------- - pass: 8878 + pass: 8880 fail: 29 crash: 95 - skip: 997 + skip: 998 timeout: 0 warn: 2 incomplete: 0 @@ -1136,4 +1137,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 10001 + total: 10004 diff --git a/.gitlab-ci/piglit/llvmpipe-glslparser.txt b/.gitlab-ci/piglit/llvmpipe-glslparser.txt index 824aa502c29..692dd3ad580 100644 --- a/.gitlab-ci/piglit/llvmpipe-glslparser.txt +++ b/.gitlab-ci/piglit/llvmpipe-glslparser.txt @@ -2059,6 +2059,7 @@ 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_separate_shader_objects/compiler/3.00/redeclare_built-in_variable.vert: skip spec/ext_separate_shader_objects/preprocessor/disabled-defined-es.comp: skip spec/ext_separate_shader_objects/preprocessor/disabled-defined-es.frag: skip spec/ext_separate_shader_objects/preprocessor/disabled-defined-es.geom: skip @@ -2430,6 +2431,32 @@ 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/nv_shader_atomic_int64/compiler/shared-atomicadd-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicand-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicand-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomiccompswap-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicexchange-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicmax-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicmax-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicmin-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicmin-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicor-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicor-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicxor-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/shared-atomicxor-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicadd-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicand-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicand-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomiccompswap-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicexchange-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicmax-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicmax-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicmin-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicmin-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicor-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicor-uint-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicxor-int-fail.comp: skip +spec/nv_shader_atomic_int64/compiler/ssbo-atomicxor-uint-fail.comp: skip spec/nv_viewport_array2/compiler/viewport_relative-bad.vert: skip spec/nv_viewport_array2/compiler/viewport_relative.geom: skip spec/nv_viewport_array2/compiler/viewport_relative.tesc: skip @@ -2578,7 +2605,7 @@ summary: pass: 12265 fail: 4 crash: 4 - skip: 2566 + skip: 2593 timeout: 0 warn: 0 incomplete: 0 @@ -2587,4 +2614,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 14839 + total: 14866 diff --git a/.gitlab-ci/piglit/llvmpipe-quick_gl.txt b/.gitlab-ci/piglit/llvmpipe-quick_gl.txt index c80cd2a0d82..ad27e2d3888 100644 --- a/.gitlab-ci/piglit/llvmpipe-quick_gl.txt +++ b/.gitlab-ci/piglit/llvmpipe-quick_gl.txt @@ -389,6 +389,10 @@ spec/!opengl 2.0/vertex-program-two-side/vs, gs and fs: skip spec/!opengl 2.0/vertex-program-two-side/vs, tcs, tes and fs: skip spec/!opengl 3.0/clearbuffer-depth-cs-probe: fail spec/!opengl 3.1/draw-buffers-errors: skip +spec/!opengl 3.2/gl-3.2-adj-prims cull-back pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims cull-front pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims line cull-back pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims line cull-front pv-first: fail spec/!opengl 3.2/gl-3.2-adj-prims pv-first: fail spec/!opengl 3.2/layered-rendering/clear-color-mismatched-layer-count: fail spec/!opengl es 2.0/invalid-es3-queries_gles2: skip @@ -894,6 +898,7 @@ spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_msc_and_sbc_ spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_null_pointers: skip spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_ust_test: skip spec/egl_ext_image_dma_buf_import_modifiers/conformance: skip +spec/egl_ext_protected_content/conformance: skip spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_with_display_bound_in_other_thread: skip spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_wrong_display_same_thread: skip spec/egl_khr_gl_image/egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24: fail @@ -1396,6 +1401,7 @@ spec/ext_framebuffer_multisample_blit_scaled/blit-scaled samples=6 with gl_textu spec/ext_framebuffer_multisample_blit_scaled/blit-scaled samples=8: skip spec/ext_framebuffer_multisample_blit_scaled/blit-scaled samples=8 with gl_texture_2d_multisample_array: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-export: skip +spec/ext_image_dma_buf_import/ext_image_dma_buf_import-export-tex: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-intel_external_sampler_only: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-invalid_attributes: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-invalid_hints: skip @@ -1648,10 +1654,10 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 23146 - fail: 185 + pass: 23142 + fail: 189 crash: 1 - skip: 1437 + skip: 1439 timeout: 0 warn: 6 incomplete: 0 @@ -1660,4 +1666,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 24793 + total: 24795 diff --git a/.gitlab-ci/piglit/llvmpipe-quick_shader.txt b/.gitlab-ci/piglit/llvmpipe-quick_shader.txt index 48cdadad650..af64c956a8e 100644 --- a/.gitlab-ci/piglit/llvmpipe-quick_shader.txt +++ b/.gitlab-ci/piglit/llvmpipe-quick_shader.txt @@ -512,7 +512,7 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip summary: name: results ---- -------- - pass: 15906 + pass: 15912 fail: 82 crash: 170 skip: 259 @@ -524,4 +524,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 16417 + total: 16423 diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh index b9d85fce955..c12844a89fb 100755 --- a/.gitlab-ci/piglit/run.sh +++ b/.gitlab-ci/piglit/run.sh @@ -25,10 +25,6 @@ if [ "$VK_DRIVER" ]; then export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json" if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then - # Set environment for VulkanTools' VK_LAYER_LUNARG_screenshot layer. - export VK_LAYER_PATH="$VK_LAYER_PATH:/VulkanTools/build/etc/vulkan/explicit_layer.d" - export __LD_LIBRARY_PATH="$__LD_LIBRARY_PATH:/VulkanTools/build/lib" - # Set environment for Wine. export WINEDEBUG="-all" export WINEPREFIX="/dxvk-wine64" diff --git a/.gitlab-ci/piglit/softpipe-quick.txt b/.gitlab-ci/piglit/softpipe-quick.txt index f500a312905..b1f0759029b 100644 --- a/.gitlab-ci/piglit/softpipe-quick.txt +++ b/.gitlab-ci/piglit/softpipe-quick.txt @@ -378,6 +378,10 @@ spec/!opengl 3.0/gl30basic: fail spec/!opengl 3.0/minmax: fail spec/!opengl 3.1/minmax: fail spec/!opengl 3.1/vao-broken-attrib: crash +spec/!opengl 3.2/gl-3.2-adj-prims cull-back pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims cull-front pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims line cull-back pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims line cull-front pv-first: fail spec/!opengl 3.2/gl-3.2-adj-prims pv-first: fail spec/!opengl 3.2/layered-rendering/clear-color-all-types 2d_multisample_array single_level: fail spec/!opengl 3.2/minmax: fail @@ -547,6 +551,7 @@ spec/arb_buffer_storage/bufferstorage-persistent_gles3 read coherent client-stor spec/arb_clear_texture/arb_clear_texture-multisample: skip spec/arb_color_buffer_float/gl_rgba8_snorm-render: fail spec/arb_color_buffer_float/gl_rgba8_snorm-render-fog: fail +spec/arb_compute_shader/execution/min-dvec4-double-large-group-size: skip spec/arb_compute_variable_group_size/errors: skip spec/arb_compute_variable_group_size/execution/basic-local-size: skip spec/arb_compute_variable_group_size/execution/fixed-local-size: skip @@ -1854,6 +1859,7 @@ spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_msc_and_sbc_ spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_null_pointers: skip spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_ust_test: skip spec/egl_ext_image_dma_buf_import_modifiers/conformance: skip +spec/egl_ext_protected_content/conformance: skip spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_with_display_bound_in_other_thread: skip spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_wrong_display_same_thread: skip spec/egl_khr_gl_image/egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24: fail @@ -2496,6 +2502,7 @@ spec/ext_framebuffer_multisample_blit_scaled/blit-scaled samples=8: skip spec/ext_framebuffer_multisample_blit_scaled/blit-scaled samples=8 with gl_texture_2d_multisample_array: skip spec/ext_framebuffer_object/fbo-blending-snorm: fail spec/ext_image_dma_buf_import/ext_image_dma_buf_import-export: skip +spec/ext_image_dma_buf_import/ext_image_dma_buf_import-export-tex: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-intel_external_sampler_only: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-invalid_attributes: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-invalid_hints: skip @@ -3058,10 +3065,10 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 26857 - fail: 400 + pass: 26855 + fail: 404 crash: 38 - skip: 2590 + skip: 2593 timeout: 0 warn: 4 incomplete: 0 @@ -3070,4 +3077,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 29914 + total: 29919 diff --git a/.gitlab-ci/piglit/vc4-rpi3-quick_gl.txt b/.gitlab-ci/piglit/vc4-rpi3-quick_gl.txt index 73058ea0c22..a7f522c8a62 100644 --- a/.gitlab-ci/piglit/vc4-rpi3-quick_gl.txt +++ b/.gitlab-ci/piglit/vc4-rpi3-quick_gl.txt @@ -4407,6 +4407,7 @@ spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_null_pointer spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_ust_test: skip spec/egl_ext_client_extensions/conformance test 3: skip spec/egl_ext_image_dma_buf_import_modifiers/conformance: fail +spec/egl_ext_protected_content/conformance: skip spec/egl_khr_create_context/3.2 core profile required: skip spec/egl_khr_create_context/default major version gl: skip spec/egl_khr_create_context/default major version gles: skip @@ -4655,6 +4656,7 @@ spec/ext_framebuffer_object/fbo-storage-formats/gl_rg8: skip spec/ext_gpu_shader4/bindfragdatalocation mixed-int-float-fbo: skip spec/ext_gpu_shader4/bindfragdatalocation mixed-int-float-fbo int_second: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-export: fail +spec/ext_image_dma_buf_import/ext_image_dma_buf_import-export-tex: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-intel_external_sampler_only: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_ayuv: fail spec/ext_image_dma_buf_import/ext_image_dma_buf_import-sample_p010: fail @@ -5421,8 +5423,7 @@ spec/intel_performance_query/intel_performance_query-issue_2235: fail spec/khr_parallel_shader_compile/basic_gles2: skip spec/khr_texture_compression_astc/array-gl: skip spec/khr_texture_compression_astc/array-gles: skip -spec/khr_texture_compression_astc/basic-gl: fail -spec/khr_texture_compression_astc/basic-gles: skip +spec/khr_texture_compression_astc/basic-gles: 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 @@ -5573,10 +5574,10 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 2197 + pass: 2198 fail: 294 crash: 50 - skip: 5181 + skip: 5182 timeout: 0 warn: 1 incomplete: 2 @@ -5585,4 +5586,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 7769 + total: 7771 diff --git a/.gitlab-ci/piglit/vc4-rpi3-quick_shader.txt b/.gitlab-ci/piglit/vc4-rpi3-quick_shader.txt index 18d7947845c..43b8daeada1 100644 --- a/.gitlab-ci/piglit/vc4-rpi3-quick_shader.txt +++ b/.gitlab-ci/piglit/vc4-rpi3-quick_shader.txt @@ -266,6 +266,7 @@ 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/min-dvec4-double-large-group-size: 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 @@ -309,6 +310,7 @@ spec/arb_cull_distance/fs-cull-distance-sizeable-to-max: skip spec/arb_cull_distance/vs-cull-distance-vertex-inside-cull-volume: skip spec/arb_cull_distance/vs-cull-distance-vertex-on-plane: skip spec/arb_cull_distance/vs-cull-distance-vertex-outside-cull-volume: skip +spec/arb_derivative_control/execution/derivatives-vs-flat-input: skip spec/arb_derivative_control/execution/dfdx-coarse: skip spec/arb_derivative_control/execution/dfdx-dfdy: skip spec/arb_derivative_control/execution/dfdx-fine: skip @@ -3041,6 +3043,7 @@ spec/glsl-1.50/execution/interface-blocks-with-gs: skip spec/glsl-1.50/execution/interface-vs-named-to-gs-array: skip spec/glsl-1.50/execution/interface-vs-unnamed-to-fs-unnamed: skip spec/glsl-1.50/execution/invariant-qualifier-everywhere: skip +spec/glsl-1.50/execution/out-of-ssa-dfs-pre-order: skip spec/glsl-1.50/execution/primitive-id-no-gs: skip spec/glsl-1.50/execution/primitive-id-no-gs-first-vertex: skip spec/glsl-1.50/execution/primitive-id-no-gs-instanced: skip @@ -3355,7 +3358,7 @@ summary: pass: 3153 fail: 75 crash: 1 - skip: 3275 + skip: 3278 timeout: 0 warn: 0 incomplete: 0 @@ -3364,4 +3367,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 6504 + total: 6507 diff --git a/.gitlab-ci/piglit/zink-quick_gl.txt b/.gitlab-ci/piglit/zink-quick_gl.txt index b10373b6067..888b0547aa6 100644 --- a/.gitlab-ci/piglit/zink-quick_gl.txt +++ b/.gitlab-ci/piglit/zink-quick_gl.txt @@ -398,6 +398,10 @@ spec/!opengl 2.0/vertex-program-two-side/vs, gs and fs: skip spec/!opengl 2.0/vertex-program-two-side/vs, tcs, tes and fs: skip spec/!opengl 3.0/clearbuffer-depth-cs-probe: fail spec/!opengl 3.1/draw-buffers-errors: skip +spec/!opengl 3.2/gl-3.2-adj-prims cull-back pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims cull-front pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims line cull-back pv-first: fail +spec/!opengl 3.2/gl-3.2-adj-prims line cull-front pv-first: fail spec/!opengl 3.2/gl-3.2-adj-prims pv-first: fail spec/!opengl 3.2/layered-rendering/clear-color-mismatched-layer-count: fail spec/!opengl es 2.0/invalid-es3-queries_gles2: skip @@ -908,6 +912,7 @@ spec/egl_ext_platform_device/conformance/create_pbuffer: skip spec/egl_ext_platform_device/conformance/create_pixmap: skip spec/egl_ext_platform_device/conformance/create_window: skip spec/egl_ext_platform_device/conformance/initialize_display: skip +spec/egl_ext_protected_content/conformance: skip spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_with_display_bound_in_other_thread: skip spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_wrong_display_same_thread: skip spec/egl_khr_gl_image/egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24: fail @@ -1410,6 +1415,7 @@ spec/ext_framebuffer_multisample_blit_scaled/blit-scaled samples=6 with gl_textu spec/ext_framebuffer_multisample_blit_scaled/blit-scaled samples=8: skip spec/ext_framebuffer_multisample_blit_scaled/blit-scaled samples=8 with gl_texture_2d_multisample_array: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-export: skip +spec/ext_image_dma_buf_import/ext_image_dma_buf_import-export-tex: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-intel_external_sampler_only: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-invalid_attributes: skip spec/ext_image_dma_buf_import/ext_image_dma_buf_import-invalid_hints: skip @@ -1663,10 +1669,10 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 23175 - fail: 185 + pass: 23171 + fail: 189 crash: 1 - skip: 1452 + skip: 1454 timeout: 0 warn: 6 incomplete: 0 @@ -1675,4 +1681,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 24837 + total: 24839