Mesa (staging/21.2): meson: drop duplicate addition of surfaceless & drm to the list of platforms

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 83c781e45a2b251cca8898213b1e6c8e46635565
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83c781e45a2b251cca8898213b1e6c8e46635565

Author: Eric Engestrom <eric at engestrom.ch>
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 <eric at engestrom.ch>
Reviewed-by: Adam Jackson <ajax at redhat.com>
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 909f99b78c2..195de5a6163 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -859,7 +859,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 9f0b3cba548..bcc21179a5f 100644
--- a/meson.build
+++ b/meson.build
@@ -2187,10 +2187,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')