From 6bac377fa5bf49aaa092f7fdc7dc54a1d1649c9a Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 7 Jan 2024 13:50:02 +0100 Subject: [PATCH] gdk: Don't include vulkan.h in public API anymore --- gdk/gdkvulkancontext.h | 4 ---- gsk/gpu/gskvulkanmemoryprivate.h | 2 ++ tests/testdmabuf.c | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h index 3bc9f50961..bbcb9d8abf 100644 --- a/gdk/gdkvulkancontext.h +++ b/gdk/gdkvulkancontext.h @@ -26,10 +26,6 @@ #include -#ifdef GDK_RENDERING_VULKAN -#include -#endif - G_BEGIN_DECLS #define GDK_TYPE_VULKAN_CONTEXT (gdk_vulkan_context_get_type ()) diff --git a/gsk/gpu/gskvulkanmemoryprivate.h b/gsk/gpu/gskvulkanmemoryprivate.h index 6dcb30c05a..5fa7f615de 100644 --- a/gsk/gpu/gskvulkanmemoryprivate.h +++ b/gsk/gpu/gskvulkanmemoryprivate.h @@ -2,6 +2,8 @@ #include +#include + G_BEGIN_DECLS #define GSK_VULKAN_MEMORY_MAPPABLE (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | \ diff --git a/tests/testdmabuf.c b/tests/testdmabuf.c index 6ca82bd47f..c6a2e263d8 100644 --- a/tests/testdmabuf.c +++ b/tests/testdmabuf.c @@ -6,6 +6,9 @@ #include #include +#ifdef GDK_RENDERING_VULKAN +#include +#endif /* For this to work, you may need to give /dev/dma_heap/system * lax permissions. */