From 1610b3dede1d0d3246bd803f80ec5f2843668cda Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 17 Feb 2017 11:41:03 -0800 Subject: anv: don't pass xmlfile via stdin anv_entrypoints_gen.py It's slow, and has the potential for encoding issues. v2: - pass xml file location via argument - update Android.mk Signed-off-by: Dylan Baker --- src/intel/Makefile.vulkan.am | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/intel/Makefile.vulkan.am') diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am index 28150098769..bf6b25b4580 100644 --- a/src/intel/Makefile.vulkan.am +++ b/src/intel/Makefile.vulkan.am @@ -24,15 +24,11 @@ # out and we'll fail at `make dist' vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml -vulkan/anv_entrypoints.h: vulkan/anv_entrypoints_gen.py $(vulkan_api_xml) - $(MKDIR_GEN) - $(AM_V_GEN) cat $(vulkan_api_xml) |\ - $(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py header > $@ - -vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py $(vulkan_api_xml) - $(MKDIR_GEN) - $(AM_V_GEN) cat $(vulkan_api_xml) |\ - $(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py code > $@ +vulkan/anv_entrypoints.h : vulkan/anv_entrypoints_gen.py $(vulkan_api_xml) + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py header --xml $(vulkan_api_xml) > $@ + +vulkan/anv_entrypoints.c : vulkan/anv_entrypoints_gen.py $(vulkan_api_xml) + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py code --xml $(vulkan_api_xml) > $@ BUILT_SOURCES += $(VULKAN_GENERATED_FILES) CLEANFILES += \ -- cgit v1.2.3