summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorEric Engestrom <eric@igalia.com>2023-02-23 13:21:56 +0000
committerMarge Bot <emma+marge@anholt.net>2023-02-23 18:31:22 +0000
commit2bf24c84f3edf2611d741aa80bbd2ccf2994f010 (patch)
tree74cdf0f0f935356fef6adee31fd09c50de1519ca /src/glx
parentc8d7e0c0235327928d9d9b12c0b603739e53f1c5 (diff)
glx: include directly the useful vulkan header, instead of including everything
Signed-off-by: Eric Engestrom <eric@igalia.com> Reviewed-by: Erik Faye-Lund <kusmabite@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21489>
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/drisw_glx.c4
-rw-r--r--src/glx/meson.build2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index b69eb7c84a1..e1386c84fcc 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -23,6 +23,7 @@
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+#include <xcb/xcb.h>
#include <xcb/xproto.h>
#include <xcb/shm.h>
#include <X11/Xlib.h>
@@ -33,7 +34,8 @@
#include "drisw_priv.h"
#include <X11/extensions/shmproto.h>
#include <assert.h>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
+#include <vulkan/vulkan_xcb.h>
#include "util/u_debug.h"
#include "kopper_interface.h"
#include "loader_dri_helper.h"
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 0d0cc98e4a5..20f04742894 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -135,7 +135,7 @@ libglx = static_library(
extra_libs_libglx,
],
dependencies : [
- idep_mesautil, idep_xmlconfig, idep_vulkan_wsi_defines,
+ idep_mesautil, idep_xmlconfig,
dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd, dep_xxf86vm, dep_xshmfence
],
)