[Mesa-dev] vulkan: Move XML and generator into src/intel/genxml

[Steven Newbury]

On Sun, 2016-02-21 at 10:56 +0000, Steven Newbury wrote:
> On Sun, 2016-02-21 at 10:16 +0000, Steven Newbury wrote:
> > Hi Jason,
> > 
> > commit f6d95876888c81559d4ba773e4e6c82b184e708e in the vulkan
> > branch
> > has broken out-of-source-tree builds.  The generated header files
> > should be included from the build tree, instead of the source tree.
> 
> --- src/intel/vulkan/Makefile.am~	2016-02-21
> 09:27:01.000000000 +0000
> +++ src/intel/vulkan/Makefile.am	2016-02-21 10:36:01.625996990
> +0000
> @@ -30,6 +30,7 @@
>  
>  # Used when generating entrypoints to filter out unwanted extensions
>  VULKAN_ENTRYPOINT_CPPFLAGS = \
> +   -I$(top_builddir)/include/vulkan \
>     -I$(top_srcdir)/include/vulkan \
>     -DVK_USE_PLATFORM_XCB_KHR \
>     -DVK_USE_PLATFORM_WAYLAND_KHR

Apologies, I obviously needed my coffee.

Let me try again:

--- src/intel/vulkan/Makefile.am~	2016-02-21 11:22:59.000000000
+0000
+++ src/intel/vulkan/Makefile.am	2016-02-21 11:26:13.149236044
+0000
@@ -66,6 +66,7 @@
 	-I$(top_builddir)/src/compiler \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_builddir)/src/intel \
+	-I$(top_builddir)/src/intel/vulkan/genxml \
 	-I$(top_builddir)/src/vulkan
 
 libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init