Mesa (dri3-auto): meson: drop dri3 option and keep the default `auto` behaviour

[GitLab Mirror]

Module: Mesa
Branch: dri3-auto
Commit: 64f2c5b8eafa3cc5f21e9afaca29752aa39b274e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=64f2c5b8eafa3cc5f21e9afaca29752aa39b274e

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Fri Jun 11 12:45:58 2021 +0200

meson: drop dri3 option and keep the default `auto` behaviour

Signed-off-by: Eric Engestrom <eric at engestrom.ch>

---

 meson.build       | 14 +-------------
 meson_options.txt |  8 --------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/meson.build b/meson.build
index e7d80820308..3ae123dbdce 100644
--- a/meson.build
+++ b/meson.build
@@ -511,19 +511,7 @@ endif
 # GNU/Hurd includes egl_dri2, without drm.
 with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or
   host_machine.system() == 'gnu')
-_dri3 = get_option('dri3')
-if _dri3 == 'true'
-  _dri3 = 'enabled'
-  warning('dri3 option "true" deprecated, please use "enabled" instead.')
-elif _dri3 == 'false'
-  _dri3 = 'disabled'
-  warning('dri3 option "false" deprecated, please use "disabled" instead.')
-endif
-if _dri3 == 'auto'
-  with_dri3 = system_has_kms_drm and with_dri2
-else
-  with_dri3 = _dri3 == 'enabled'
-endif
+with_dri3 = system_has_kms_drm and with_dri2
 
 if with_any_vk and (with_platform_x11 and not with_dri3)
   error('Vulkan drivers require dri3 for X11 support')
diff --git a/meson_options.txt b/meson_options.txt
index 84150789f3c..abb58ce342f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -33,14 +33,6 @@ option(
   value : false,
   description : 'Build against android-stub',
 )
-
-option(
-  'dri3',
-  type : 'combo',
-  value : 'auto',
-  choices : ['auto', 'true', 'false', 'disabled', 'enabled'],
-  description : 'enable support for dri3'
-)
 option(
   'dri-drivers',
   type : 'array',