meson: drop deprecated EGL platform build options

These two options were deprecated and announced to be removed in 20.3,
so let's drop them now.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Cc: 20.3 <mesa-stable>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5844>
This commit is contained in:
Eric Engestrom 2020-07-10 16:11:46 +02:00 committed by Marge Bot
parent 4da8323a14
commit f8dc22bf61
2 changed files with 1 additions and 10 deletions

View File

@ -355,14 +355,6 @@ with_platform_wayland = _platforms.contains('wayland')
with_platform_haiku = _platforms.contains('haiku') with_platform_haiku = _platforms.contains('haiku')
with_platform_windows = _platforms.contains('windows') with_platform_windows = _platforms.contains('windows')
if _platforms.contains('surfaceless')
warning('Platform `surfaceless` is now always selected; setting this option will be an error in Mesa 20.3')
endif
if _platforms.contains('drm')
warning('Platform `drm` is now automatically selected; setting this option will be an error in Mesa 20.3')
endif
if _platforms.length() != 0 if _platforms.length() != 0
egl_native_platform = _platforms[0] egl_native_platform = _platforms[0]
else else

View File

@ -23,8 +23,7 @@ option(
type : 'array', type : 'array',
value : ['auto'], value : ['auto'],
choices : [ choices : [
'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android', 'auto', 'x11', 'wayland', 'haiku', 'android', 'windows',
'windows',
], ],
description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.' description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.'
) )