diff options
| author | Chad Versace <chadversary@chromium.org> | 2017-08-22 16:26:03 -0700 |
|---|---|---|
| committer | Chad Versace <chadversary@chromium.org> | 2017-09-18 14:26:54 -0700 |
| commit | 39c9d435364a30a97b64c2b6388081cdcefbf683 (patch) | |
| tree | f4fbd7f4364421df0b31d3d909ee864f4c1b39e7 /src/intel/Makefile.vulkan.am | |
| parent | 6a5ff18039d0c35e79ac24ceae2479d5c7c85bd3 (diff) | |
anv: Feed vk_android_native_buffer.xml to generators (v2)
Feed the XML to anv_extensions.py and anv_entrypoints_gen.py.
Do it on all platforms, not just Android. Tested on Android and Fedora.
We always parse the Android XML, regardless of target platform, to
help reduce the chance that people working on non-Android break the
Android build.
v2:
- Squash in Tapani's changes to Android.*.mk.
Reviewed-by: Tapani Pälli <tapani.palli@intel.com> (v1)
Diffstat (limited to 'src/intel/Makefile.vulkan.am')
| -rw-r--r-- | src/intel/Makefile.vulkan.am | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am index fa9b6ba7245..8a19f96096a 100644 --- a/src/intel/Makefile.vulkan.am +++ b/src/intel/Makefile.vulkan.am @@ -23,18 +23,27 @@ # rules must be outside of any AM_CONDITIONALs. Otherwise they will be commented # out and we'll fail at `make dist' vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml +vk_android_native_buffer_xml = $(top_srcdir)/src/vulkan/registry/vk_android_native_buffer.xml vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \ - vulkan/anv_extensions.py $(vulkan_api_xml) + vulkan/anv_extensions.py \ + $(vulkan_api_xml) \ + $(vk_android_native_buffer_xml) $(MKDIR_GEN) $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py \ - --xml $(vulkan_api_xml) --outdir $(builddir)/vulkan + --xml $(vulkan_api_xml) \ + --xml $(vk_android_native_buffer_xml) \ + --outdir $(builddir)/vulkan vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c -vulkan/anv_extensions.c: vulkan/anv_extensions.py $(vulkan_api_xml) +vulkan/anv_extensions.c: vulkan/anv_extensions.py \ + $(vulkan_api_xml) \ + $(vk_android_native_buffer_xml) $(MKDIR_GEN) $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions.py \ - --xml $(vulkan_api_xml) --out $@ + --xml $(vulkan_api_xml) \ + --xml $(vk_android_native_buffer_xml) \ + --out $@ BUILT_SOURCES += $(VULKAN_GENERATED_FILES) CLEANFILES += \ |