gitlab-ci: fix vulkan build layer enabling

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 54fe5b0482 ("meson: switch vulkan layer to list of choices")
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9858>
This commit is contained in:
Lionel Landwerlin 2021-03-26 16:50:08 +02:00 committed by Marge Bot
parent a7c0cf500b
commit 5e1f5f6a7b
1 changed files with 2 additions and 4 deletions

View File

@ -983,8 +983,7 @@ meson-vulkan:
UBSAN_OPTIONS: "print_stacktrace=1"
VULKAN_DRIVERS: intel,amd,freedreno,broadcom
EXTRA_OPTION: >
-D vulkan-overlay-layer=true
-D vulkan-device-select-layer=true
-D vulkan-layers=device-select,overlay
-D build-aco-tests=true
-D werror=true
@ -998,8 +997,7 @@ meson-i386:
GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink"
DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
EXTRA_OPTION: >
-D vulkan-overlay-layer=true
-D vulkan-device-select-layer=true
-D vulkan-layers=device-select,overlay
-D werror=true
meson-s390x: