Mesa (master): turnip: Drop explicit configure opt-in for turnip
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Feb 6 22:15:54 UTC 2020
Module: Mesa
Branch: master
Commit: b3063cbd185b3bb2e01ab4f70ca0c661f38082b4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3063cbd185b3bb2e01ab4f70ca0c661f38082b4
Author: Kristian H. Kristensen <hoegsberg at google.com>
Date: Thu Feb 6 13:21:59 2020 -0800
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>
---
meson.build | 4 ----
meson_options.txt | 6 ------
2 files changed, 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
@@ -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',
More information about the mesa-commit
mailing list