summaryrefslogtreecommitdiffstats
path: root/src/intel/vulkan/Makefile.am
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2016-06-05 06:49:42 +1000
committerDave Airlie <[email protected]>2016-06-05 07:03:12 +1000
commitf018456901ee291181ecce74c30b19c9f6731f06 (patch)
treebc944facbca81eecd1a4e30bf0dc304a7ee00d7e /src/intel/vulkan/Makefile.am
parentd5491a81ff5ad8c9ef877f59a3d61252e1cffb98 (diff)
anv/entrypoints: don't go using wayland/xcb unless they are configured
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. [airlied: fixed up to put in pre-existing sections]. Reported-by: Arjan van de Ven Reviewed-by: Jason Ekstrand <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/intel/vulkan/Makefile.am')
-rw-r--r--src/intel/vulkan/Makefile.am15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 3294fa48179..db81838ff67 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -82,12 +82,17 @@ VULKAN_SOURCES = \
VULKAN_LIB_DEPS =
+VULKAN_ENTRYPOINT_CPPFLAGS =
if HAVE_PLATFORM_X11
AM_CPPFLAGS += \
$(XCB_DRI3_CFLAGS) \
-DVK_USE_PLATFORM_XCB_KHR
+VULKAN_ENTRYPOINT_CPPFLAGS += \
+ $(XCB_DRI3_CFLAGS) \
+ -DVK_USE_PLATFORM_XCB_KHR
+
VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES)
VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS)
endif
@@ -100,6 +105,10 @@ AM_CPPFLAGS += \
$(WAYLAND_CFLAGS) \
-DVK_USE_PLATFORM_WAYLAND_KHR
+VULKAN_ENTRYPOINT_CPPFLAGS += \
+ $(WAYLAND_CFLAGS) \
+ -DVK_USE_PLATFORM_WAYLAND_KHR
+
VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
VULKAN_LIB_DEPS += \
@@ -124,12 +133,6 @@ VULKAN_LIB_DEPS += \
nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp
libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)
-VULKAN_ENTRYPOINT_CPPFLAGS = \
- $(XCB_DRI3_CFLAGS) \
- $(WAYLAND_CFLAGS) \
- -DVK_USE_PLATFORM_XCB_KHR \
- -DVK_USE_PLATFORM_WAYLAND_KHR
-
anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
$(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\
$(PYTHON2) $(srcdir)/anv_entrypoints_gen.py header > $@