From: Kristian H. Kristensen <hoegsberg@google.com>
Date: Thu, 6 Feb 2020 22:49:57 +0000 (-0800)
Subject: ci: Drop turnip opt-in option
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26ab38f1440625b85adc235140574901e60562a1;p=mesa.git

ci: Drop turnip opt-in option

Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3742>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3742>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 571d6601cbe..d170f33b2e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -322,8 +322,6 @@ meson-main:
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
     BUILDTYPE: "debugoptimized"
-    EXTRA_OPTION: >
-      -D I-love-half-baked-turnips=true
   tags:
     - aarch64
 
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index b618f45a2c2..b16a82472b7 100755
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -54,7 +54,6 @@ meson _build --native-file=native.file \
       ${GALLIUM_ST} \
       -D gallium-drivers=${GALLIUM_DRIVERS:-[]} \
       -D vulkan-drivers=${VULKAN_DRIVERS:-[]} \
-      -D I-love-half-baked-turnips=true \
       ${EXTRA_OPTION}
 cd _build
 meson configure