Module: Mesa Branch: main Commit: c8d7e0c0235327928d9d9b12c0b603739e53f1c5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8d7e0c0235327928d9d9b12c0b603739e53f1c5
Author: Eric Engestrom <[email protected]> Date: Thu Feb 23 13:21:22 2023 +0000 egl: include directly the useful vulkan header, instead of including everything Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21489> --- src/egl/drivers/dri2/platform_wayland.c | 3 ++- src/egl/drivers/dri2/platform_x11.c | 4 +++- src/egl/meson.build | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 34e356e986b..e48777e8eb0 100644 --- 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 a362ccef52b..0a4889cb96c 100644 --- 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 0a351bb687d..708c1206b97 100644 --- 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
