From 04b931cbca9916060ac245b59572cb9fe17091f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 17 Sep 2022 14:07:53 +0200 Subject: [PATCH] package/archlinux: use llvmpipe instead of swiftshader for Vulkan tests. It's easier to get. --- package/archlinux/PKGBUILD | 4 ++-- package/archlinux/PKGBUILD-coverage | 3 ++- package/archlinux/PKGBUILD-release | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 56f5e9542..c231b1be5 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -8,7 +8,7 @@ url="https://magnum.graphics" license=('MIT') depends=('corrade' 'openal' 'sdl2' 'glfw' 'vulkan-icd-loader') makedepends=('cmake' 'ninja') -checkdepends=('swiftshader') +checkdepends=('vulkan-swrast') options=('!strip') provides=('magnum-git') @@ -75,7 +75,7 @@ check() { MAGNUM_DISABLE_EXTENSIONS="GL_ARB_uniform_buffer_object" ctest --output-on-failure -j9 -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_KHR_debug" ctest --output-on-failure -j9 -R GLTest - # Run all Vulkan tests with SwiftShader as well + # Run all Vulkan tests with llvmpipe as well # Keep in sync with PKGBUILD-coverage, PKGBUILD-release and # package/ci/unix-desktop-vulkan.sh MAGNUM_DEVICE=cpu ctest --output-on-failure -j9 -R VkTest diff --git a/package/archlinux/PKGBUILD-coverage b/package/archlinux/PKGBUILD-coverage index fe99e5de5..a4a42c78c 100644 --- a/package/archlinux/PKGBUILD-coverage +++ b/package/archlinux/PKGBUILD-coverage @@ -8,6 +8,7 @@ url="https://magnum.graphics" license=('MIT') depends=('corrade' 'openal' 'sdl2' 'glfw' 'vulkan-icd-loader') makedepends=('cmake' 'ninja' 'lcov') +checkdepends=('vulkan-swrast') options=('!strip') provides=('magnum-git') @@ -76,7 +77,7 @@ check() { MAGNUM_DISABLE_EXTENSIONS="GL_ARB_uniform_buffer_object" ctest --output-on-failure -j9 -R GLTest || true MAGNUM_DISABLE_EXTENSIONS="GL_KHR_debug" ctest --output-on-failure -j9 -R GLTest || true - # Run all Vulkan tests with SwiftShader as well + # Run all Vulkan tests with llvmpipe as well # Keep in sync with PKGBUILD, PKGBUILD-release and # package/ci/unix-desktop-vulkan.sh MAGNUM_DEVICE=cpu ctest --output-on-failure -j9 -R VkTest || true diff --git a/package/archlinux/PKGBUILD-release b/package/archlinux/PKGBUILD-release index b4d288b10..40732c072 100644 --- a/package/archlinux/PKGBUILD-release +++ b/package/archlinux/PKGBUILD-release @@ -8,7 +8,7 @@ url="https://magnum.graphics" license=('MIT') depends=('corrade' 'openal' 'sdl2' 'glfw' 'vulkan-icd-loader') makedepends=('cmake' 'ninja') -checkdepends=('swiftshader') +checkdepends=('vulkan-swrast') options=('!strip') provides=('magnum-git') @@ -115,7 +115,7 @@ check() { MAGNUM_DISABLE_EXTENSIONS="GL_ARB_uniform_buffer_object" ctest --output-on-failure -j9 -R GLTest MAGNUM_DISABLE_EXTENSIONS="GL_KHR_debug" ctest --output-on-failure -j9 -R GLTest - # Run all Vulkan tests with SwiftShader as well + # Run all Vulkan tests with llvmpipe as well # Keep in sync with PKGBUILD, PKGBUILD-coverage and # package/ci/unix-desktop-vulkan.sh MAGNUM_DEVICE=cpu ctest --output-on-failure -j9 -R VkTest