egl: 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>

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 34e356e..e48777e 100644 (file)
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -34,7 +34,8 @@
 #include <dlfcn.h>
 #include <errno.h>
 #include <unistd.h>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
+#include <vulkan/vulkan_wayland.h>
 #include <fcntl.h>
 #include <xf86drm.h>
 #include "drm-uapi/drm_fourcc.h"

diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index a362cce..0a4889c 100644 (file)
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -35,7 +35,9 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
-#include <vulkan/vulkan.h>
+#include <xcb/xcb.h>
+#include <vulkan/vulkan_core.h>
+#include <vulkan/vulkan_xcb.h>
 #ifdef HAVE_LIBDRM
 #include <xf86drm.h>
 #endif

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 0a351bb..708c120 100644 (file)
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -95,7 +95,6 @@ if with_dri2
   )
   files_egl += sha1_h
   deps_for_egl += idep_xmlconfig
-  deps_for_egl += idep_vulkan_wsi_defines
   link_for_egl += libloader
   incs_for_egl += inc_loader
   incs_for_egl += inc_gallium