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>

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index db81838ff67b97d4e17107cc63d3e5ff313343d3..4d9ff908bbcc2aa8032261c414125ec7689fd8ae 100644 (file)
--- 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)