summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2016-06-06 14:29:19 -0700
committerEmil Velikov <emil.l.velikov@gmail.com>2016-06-07 12:30:25 +0100
commitd1e141a661b4ba7ffb0eac61d3288de76b4a8af1 (patch)
tree2fc402f2627204b2195822077756d86637585c5d
parentd1a53f91ee950720b54c35b7d61f0213659533de (diff)
anv/entrypoints: Stop using the C preprocessor
Now that we emit guards for everything, we can just generate the files and trust build flags to keep us safe. This should also fix the tarball problems. Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--src/intel/vulkan/Makefile.am14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index db81838ff67..4d9ff908bbc 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -82,17 +82,11 @@ 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
@@ -105,10 +99,6 @@ 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 += \
@@ -134,11 +124,11 @@ nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp
libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)
anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
- $(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\
+ $(AM_V_GEN) cat $(vulkan_include_HEADERS) |\
$(PYTHON2) $(srcdir)/anv_entrypoints_gen.py header > $@
anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
- $(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\
+ $(AM_V_GEN) cat $(vulkan_include_HEADERS) |\
$(PYTHON2) $(srcdir)/anv_entrypoints_gen.py code > $@
BUILT_SOURCES = $(VULKAN_GENERATED_FILES)