From: Dave Airlie <airl...@redhat.com>
The fix in:
anv: let anv_entrypoints_gen.py generate proper Wayland/Xcb guards
breaks things if wayland headers aren't installed.
Separate things out properly to avoid that problem.
Reported-by: Arjan van de Ven
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/intel/vulkan/Makefile.am | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 3294fa4..0efcc4d 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -124,11 +124,19 @@ VULKAN_LIB_DEPS += \
nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp
libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)
-VULKAN_ENTRYPOINT_CPPFLAGS = \
- $(XCB_DRI3_CFLAGS) \
+VULKAN_ENTRYPOINT_CPPFLAGS =
+
+if HAVE_PLATFORM_WAYLAND
+VULKAN_ENTRYPOINT_CPPFLAGS += \
$(WAYLAND_CFLAGS) \
- -DVK_USE_PLATFORM_XCB_KHR \
-DVK_USE_PLATFORM_WAYLAND_KHR
+endif
+
+if HAVE_PLATFORM_X11
+VULKAN_ENTRYPOINT_CPPFLAGS += \
+ $(XCB_DRI3_CFLAGS) \
+ -DVK_USE_PLATFORM_XCB_KHR
+endif
anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
$(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS)
$(top_srcdir)/include/vulkan/vulkan_intel.h |\
--
2.5.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
