On 2 March 2017 at 05:28, Jason Ekstrand <ja...@jlekstrand.net> wrote:
> --- a/src/intel/Makefile.sources > +++ b/src/intel/Makefile.sources > +VULKAN_GEN7_FILES := \ > + vulkan/gen7_cmd_buffer.c \ > + $(VULKAN_GENX_FILES) > + > +VULKAN_GEN75_FILES := \ > + vulkan/gen7_cmd_buffer.c \ > + $(VULKAN_GENX_FILES) > + > +VULKAN_GEN8_FILES := \ > + vulkan/gen8_cmd_buffer.c \ > + $(VULKAN_GENX_FILES) > + > +VULKAN_GEN9_FILES := \ > + vulkan/gen8_cmd_buffer.c \ > + $(VULKAN_GENX_FILES) Seems like the VULKAN_GENX_FILES lines are aligned with spaces. Please use tabs or make can go crazy. > +VULKAN_CFLAGS = $(LIBDRM_CFLAGS) $(AM_CFLAGS) -msse2 > + (Please keep alignment with tabs, if my email client decides to butcher it) VULKAN_CFLAGS = \ $(AM_CFLAGS) \ -msse2 > +VULKAN_CPPFLAGS = \ > + -I$(top_srcdir)/src/compiler \ > + -I$(top_srcdir)/src/intel/compiler \ > + -I$(top_srcdir)/src/vulkan \ > + -I$(top_srcdir)/src/vulkan/wsi \ > + -I$(top_srcdir)/src/vulkan/util \ $(LIBDRM_CFLAGS) \ > + $(AM_CPPFLAGS) The CPPFLAGS could use some extra cleanups but that applies for pretty much everywhere, so I wouldn't bother you with it :-) > +vulkan/anv_entrypoints.h : vulkan/anv_entrypoints_gen.py $(vulkan_api_xml) > + $(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) > + $(AM_V_GEN) cat $(vulkan_api_xml) |\ > + $(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py code > $@ > + This will clash with Dylan's work in the area. Fwiw I'd love to see that one land first, but it's not my call either way. > +BUILT_SOURCES += $(VULKAN_GENERATED_FILES) > +CLEANFILES += $(VULKAN_GENERATED_FILES) dev_icd.json > intel_icd.@host_cpu@.json Missing vulkan/ prefix for both .json files > +vulkan_tests_block_pool_no_free_LDADD = $(VULKAN_TEST_LDADD) > +vulkan_tests_block_pool_no_free_CPPFLAGS = $(VULKAN_CPPFLAGS) > + > +vulkan_tests_state_pool_no_free_LDADD = $(VULKAN_TEST_LDADD) > +vulkan_tests_state_pool_no_free_CPPFLAGS = $(VULKAN_CPPFLAGS) > + > +vulkan_tests_state_pool_free_list_only_LDADD = $(VULKAN_TEST_LDADD) > +vulkan_tests_state_pool_free_list_only_CPPFLAGS = $(VULKAN_CPPFLAGS) > + > +vulkan_tests_state_pool_LDADD = $(VULKAN_TEST_LDADD) > +vulkan_tests_state_pool_CPPFLAGS = $(VULKAN_CPPFLAGS) > + Nit: please flip order - first CPPFLAGS then LDADD There should be a couple of Android fixes in your inbox if Tapani/Mauro/others don't come up with anything better. -Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev