From: Kristian H. Kristensen <hoegsberg@google.com>
Date: Thu, 6 Feb 2020 21:21:59 +0000 (-0800)
Subject: turnip: Drop explicit configure opt-in for turnip
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b3063cbd185b3bb2e01ab4f70ca0c661f38082b4;p=mesa.git

turnip: Drop explicit configure opt-in for turnip

We don't need this silly thing anymore. Everthing here is WIP.

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

diff --git a/meson.build b/meson.build
index 9d9f3031e90..fb037d760ca 100644
--- a/meson.build
+++ b/meson.build
@@ -244,10 +244,6 @@ with_amd_vk = _vulkan_drivers.contains('amd')
 with_freedreno_vk = _vulkan_drivers.contains('freedreno')
 with_any_vk = _vulkan_drivers.length() != 0 and _vulkan_drivers != ['']
 
-if with_freedreno_vk and get_option('I-love-half-baked-turnips') != true
-  error('Cannot enable freedreno vulkan driver')
-endif
-
 if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr)
   error('Only one swrast provider can be built')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 1a2dd8ebd12..a39596a6f19 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -348,12 +348,6 @@ option(
   value : true,
   description : 'Enable direct rendering in GLX and EGL for DRI',
 )
-option(
-  'I-love-half-baked-turnips',
-  type : 'boolean',
-  value : false,
-  description : 'Allow work-in-progress freedreno vulkan driver to be enabled',
-)
 option(
   'prefer-iris',
   type : 'boolean',