Mesa (main): meson: always define `HAVE_{X11,XCB}_PLATFORM` when it's enabled

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 5cc9c30aefdfc58f180d03e16af5ed38f8fb7ef0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cc9c30aefdfc58f180d03e16af5ed38f8fb7ef0

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Sat Oct  9 12:05:00 2021 +0100

meson: always define `HAVE_{X11,XCB}_PLATFORM` when it's enabled

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>

---

 meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 4fb4cfc5555..b383ef7d46b 100644
--- a/meson.build
+++ b/meson.build
@@ -916,10 +916,8 @@ endif
 
 gl_pkgconfig_c_flags = []
 if with_platform_x11
-  if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
-    pre_args += '-DHAVE_X11_PLATFORM'
-    pre_args += '-DHAVE_XCB_PLATFORM'
-  endif
+  pre_args += '-DHAVE_X11_PLATFORM'
+  pre_args += '-DHAVE_XCB_PLATFORM'
   if with_glx == 'xlib' or with_glx == 'gallium-xlib'
     pre_args += '-DUSE_XSHM'
   else