[Mesa-dev] [PATCH 16/25] anv: get rid of VULKAN_ENTRYPOINT_CPPFLAGS variable

[Emil Velikov]

Add the missing include to AM_CPPFLAGS and use it throughout the
makefile.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/intel/vulkan/Makefile.am | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 3169a4d..39ef9e2 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -28,10 +28,6 @@ vulkan_include_HEADERS =				\
 	$(top_srcdir)/include/vulkan/vulkan.h		\
 	$(top_srcdir)/include/vulkan/vulkan_intel.h
 
-# Used when generating entrypoints to filter out unwanted extensions
-VULKAN_ENTRYPOINT_CPPFLAGS = \
-   -I$(top_srcdir)/include/vulkan
-
 lib_LTLIBRARIES = libvulkan_intel.la
 
 check_LTLIBRARIES = libvulkan-test.la
@@ -51,6 +47,7 @@ AM_CPPFLAGS = \
 	$(VALGRIND_CFLAGS) \
 	$(DEFINES) \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/vulkan \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/compiler \
 	-I$(top_srcdir)/src/mapi \
@@ -91,9 +88,6 @@ libanv_gen9_la_SOURCES = $(GEN9_FILES)
 
 
 if HAVE_EGL_PLATFORM_X11
-VULKAN_ENTRYPOINT_CPPFLAGS += \
-	-DVK_USE_PLATFORM_XCB_KHR
-
 AM_CPPFLAGS += \
 	$(XCB_DRI3_CFLAGS) \
 	-DVK_USE_PLATFORM_XCB_KHR
@@ -104,8 +98,6 @@ endif
 
 
 if HAVE_EGL_PLATFORM_WAYLAND
-VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR
-
 AM_CPPFLAGS += \
 	-I$(top_builddir)/src/egl/wayland/wayland-drm \
 	-I$(top_srcdir)/src/egl/wayland/wayland-drm
@@ -135,10 +127,10 @@ VULKAN_LIB_DEPS += \
 libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)
 
 anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
-	$(AM_V_GEN) cat $(vulkan_include_HEADERS) | $(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) - | $(PYTHON2) $< header > $@
+	$(AM_V_GEN) cat $(vulkan_include_HEADERS) | $(CPP) $(AM_CPPFLAGS) - | $(PYTHON2) $< header > $@
 
 anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
-	$(AM_V_GEN) cat $(vulkan_include_HEADERS) | $(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) - | $(PYTHON2) $< code > $@
+	$(AM_V_GEN) cat $(vulkan_include_HEADERS) | $(CPP) $(AM_CPPFLAGS) - | $(PYTHON2) $< code > $@
 
 CLEANFILES = $(BUILT_SOURCES)
 
-- 
2.8.0