diff options
author | Kristian H. Kristensen <[email protected]> | 2020-02-06 13:21:59 -0800 |
---|---|---|
committer | Kristian H. Kristensen <[email protected]> | 2020-02-06 13:23:40 -0800 |
commit | b3063cbd185b3bb2e01ab4f70ca0c661f38082b4 (patch) | |
tree | 970677e812653a08f9e07c849d53fa3566f75d62 | |
parent | 4ca77f347d2e5791907db77ef1996f01ff9aa386 (diff) |
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>
-rw-r--r-- | meson.build | 4 | ||||
-rw-r--r-- | meson_options.txt | 6 |
2 files changed, 0 insertions, 10 deletions
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 @@ -349,12 +349,6 @@ option( 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', value : true, |