gitlab-ci: fix vulkan build layer enabling
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Fri, 26 Mar 2021 14:50:08 +0000 (16:50 +0200)
committerMarge Bot <eric+marge@anholt.net>
Fri, 26 Mar 2021 19:53:39 +0000 (19:53 +0000)
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 54fe5b0482df0f ("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>

.gitlab-ci.yml

index 0c53499..b1d0884 100644 (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: