From a3d4037fb5642beb5737bbd07659c4026cfab33a Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Thu, 16 Sep 2021 19:22:03 -0400 Subject: [PATCH] Enable vulkan testing --- .github/workflows/ci.yml | 11 +++++------ .github/workflows/cts.yml | 16 +++++++++++++++- README.md | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e3136dfb..a6bf88ac6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,8 +52,8 @@ jobs: os: ubuntu-20.04 channel: stable target: x86_64-unknown-linux-gnu - kind: compile - backends: # vulkan gl + kind: test + backends: vulkan # gl - name: Linux Nightly x86_64 os: ubuntu-20.04 @@ -109,13 +109,12 @@ jobs: echo "$ANDROID_HOME/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin" >> $GITHUB_PATH - name: install llvmpipe and lavapipe - if: matrix.os == 'ubuntu-20.04' && matrix.kind == 'test' + if: matrix.os == 'ubuntu-20.04' && matrix.target != 'aarch64-linux-android' && matrix.kind == 'test' run: | sudo apt-get update -y -qq - sudo add-apt-repository ppa:ubuntu-x-swat/updates -y + sudo add-apt-repository ppa:oibaf/graphics-drivers -y sudo apt-get update - sudo apt install -y libxcb-xfixes0-dev mesa-vulkan-drivers - # add libegl1-mesa libgl1-mesa-dri for egl + sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers # We enable line numbers for panics, but that's it - name: disable debug diff --git a/.github/workflows/cts.yml b/.github/workflows/cts.yml index c7d580bf3..2bfe579f2 100644 --- a/.github/workflows/cts.yml +++ b/.github/workflows/cts.yml @@ -25,6 +25,12 @@ jobs: target: x86_64-pc-windows-msvc backends: dx12 # dx11 + # Linux + #- name: Linux x86_64 + # os: ubuntu-20.04 + # target: x86_64-unknown-linux-gnu + # backends: vulkan # gl + name: CTS ${{ matrix.name }} runs-on: ${{ matrix.os }} @@ -54,6 +60,15 @@ jobs: working-directory: wgpu/cts_runner target-dir: wgpu/cts_runner/target + - name: install llvmpipe and lavapipe + if: matrix.os == 'ubuntu-20.04' + run: | + sudo apt-get update -y -qq + sudo add-apt-repository ppa:oibaf/graphics-drivers -y + sudo apt-get update + sudo apt install -y libxcb-xfixes0-dev mesa-vulkan-drivers + # libegl1-mesa libgl1-mesa-dri for gl + # We enable line numbers for panics, but that's it - name: disable debug shell: bash @@ -67,7 +82,6 @@ jobs: cargo build --manifest-path wgpu/cts_runner/Cargo.toml - name: run CTS - if: ${{ matrix.os }} == 'windows-2019' shell: bash run: | cd cts; diff --git a/README.md b/README.md index 0548007b1..8623e15ab 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ We have multiple methods of testing, each of which tests different qualities abo | DX12/Windows 10 | :heavy_check_mark: (over WARP) | | DX11/Windows 10 | :construction: (over WARP) | | Metal/MacOS | :x: (no CPU runner) | -| Vulkan/Linux | :x: ([lavapipe segfaults](https://github.com/gfx-rs/wgpu/issues/1551)) | +| Vulkan/Linux | :ok: ([cts hangs](https://github.com/gfx-rs/wgpu/issues/1974)) | | GLES/Linux | :x: ([egl fails init](https://github.com/gfx-rs/wgpu/issues/1551)) | ### Core Test Infrastructure