projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fbc117c)
ci: Drop turnip opt-in option
authorKristian H. Kristensen <hoegsberg@google.com>
Thu, 6 Feb 2020 22:49:57 +0000 (14:49 -0800)
committerMarge Bot <eric+marge@anholt.net>
Fri, 7 Feb 2020 01:36:58 +0000 (01:36 +0000)
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3742>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3742>

.gitlab-ci.yml patch | blob | history
.gitlab-ci/meson-build.sh patch | blob | history

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 571d6601cbef67be9477eb7c8d938fb8c27a027d..d170f33b2e4d86e2e6304facd8d9d01629c082c8 100644 (file)
--- 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 b618f45a2c2442e0f946db4eb292641db2d278cf..b16a82472b71902bc706c4eadef5c9339e7fe450 100755 (executable)
--- 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