Module: Mesa Branch: staging/21.3 Commit: f2f8738bc29c51a4e2885fd839220996b745cbd5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2f8738bc29c51a4e2885fd839220996b745cbd5
Author: Eric Engestrom <[email protected]> Date: Sat Oct 9 11:14:55 2021 +0100 meson: drop duplicate addition of surfaceless & drm to the list of platforms This is already done on lines 475-480, resulting in them appearing twice in the summary. Fixes: 47946855f19cc7d082fd ("meson: allow egl_native_platform to be specified") Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Adam Jackson <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13278> (cherry picked from commit 9ad375bdcd3189be9672ea42268dec123ffca7fb) --- .pick_status.json | 2 +- meson.build | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 49884828d6c..9df80e4b10d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -697,7 +697,7 @@ "description": "meson: drop duplicate addition of surfaceless & drm to the list of platforms", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "47946855f19cc7d082fd59e090bb83f5d3930871" }, diff --git a/meson.build b/meson.build index c1f73d36a21..90c227532b7 100644 --- a/meson.build +++ b/meson.build @@ -2253,10 +2253,6 @@ if with_egl lines += 'EGL drivers: ' + ' '.join(egl_drivers) endif if with_egl or with_any_vk - _platforms += 'surfaceless' - if with_gbm and not with_platform_android - _platforms += 'drm' - endif lines += 'EGL/Vulkan/VL platforms: ' + ' '.join(_platforms) endif lines += 'GBM: ' + (with_gbm ? 'yes' : 'no')
