From 4d5dc18a575ce76b5f2469832c8d0d805b355bd9 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 1 Apr 2021 18:08:19 +0200 Subject: [PATCH] build: disable Vulkan by default We don't want people to build Vulkan support when they just want to get GTK built. This is in particular true for GTK as a CI subproject or for people using jhbuild. Worse, just having Vulkan support compiled in tends to cause crashes in the Inspector, even if you are not using it. --- .gitlab-ci/test-docker.sh | 2 +- meson_options.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/test-docker.sh b/.gitlab-ci/test-docker.sh index ada8edaba6..1df2da094a 100755 --- a/.gitlab-ci/test-docker.sh +++ b/.gitlab-ci/test-docker.sh @@ -15,7 +15,7 @@ meson \ -Dx11-backend=true \ -Dwayland-backend=true \ -Dbroadway-backend=true \ - -Dvulkan=yes \ + -Dvulkan=enabled \ -Dprofiler=true \ --werror \ ${EXTRA_MESON_FLAGS:-} \ diff --git a/meson_options.txt b/meson_options.txt index 2223cb7964..3a471a2025 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -50,8 +50,8 @@ option('print-cups', option('vulkan', type: 'feature', - value: 'auto', - description : 'Enable support for the Vulkan graphics API') + value: 'disabled', + description : 'Enable support for the experimental Vulkan graphics API') option('xinerama', type: 'feature',