<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2017-02-23 12:41 GMT+01:00 Tapani Pälli <span dir="ltr"><<a href="mailto:tapani.palli@intel.com" target="_blank">tapani.palli@intel.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="gmail-HOEnZb"><div class="gmail-h5"><br>
<br>
On 02/23/2017 12:32 PM, Emil Velikov wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
On 22 February 2017 at 23:35, Dylan Baker <<a href="mailto:dylan@pnwbakers.com" target="_blank">dylan@pnwbakers.com</a>> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
This changes the python generator to write the files itself, rather than<br>
piping them out. This has a couple of advantages: first, it encapsulates<br>
the encoding. Second, it ensures that the header file and code file are<br>
generated at the same time with the same data.<br>
<br>
</blockquote>
Last time there were some serious objections to doing this. Glad that<br>
you got those covered ;-)<br>
<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Signed-off-by: Dylan Baker <<a href="mailto:dylanx.c.baker@intel.com" target="_blank">dylanx.c.baker@intel.com</a>><br>
---<br>
src/intel/vulkan/Makefile.am | 7 ++----<br>
src/intel/vulkan/anv_entrypoi<wbr>nts_gen.py | 38 ++++++++++++------------------<wbr>---<br>
2 files changed, 16 insertions(+), 29 deletions(-)<br>
<br>
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am<br>
index 5a0e4ef4ff..68bc5ccf86 100644<br>
--- a/src/intel/vulkan/Makefile.am<br>
+++ b/src/intel/vulkan/Makefile.am<br>
@@ -145,11 +145,8 @@ libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)<br>
<br>
vulkan_api_xml = $(top_srcdir)/src/vulkan/regis<wbr>try/vk.xml<br>
<br>
-anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_api_xml)<br>
- $(AM_V_GEN)$(PYTHON2) $(srcdir)/anv_entrypoints_gen.<wbr>py header > $@<br>
-<br>
-anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_api_xml)<br>
- $(AM_V_GEN)$(PYTHON2) $(srcdir)/anv_entrypoints_gen.<wbr>py code > $@<br>
+anv_entrypoints.h anv_entrypoints.c: anv_entrypoints_gen.py $(vulkan_api_xml)<br>
+ $(AM_V_GEN)$(PYTHON2) $(srcdir)/anv_entrypoints_gen.<wbr>py<br>
<br>
</blockquote>
Please pass a "-o $dst_dir" type of argument. It will be/is broken otherwise.<br>
<br>
Small suggestion to update the Android.mk file. Feel free to Cc<br>
Tapani/Mauro so that they can test/address any concerns.<br>
<br>
Mauro, Tapani,<br>
Afaict earlier series [1] have broken things on your end, but do<br>
suggest some fixes that one can squash with this batch.<br>
</blockquote>
<br></div></div>
introduction of 'build-id' usage broke Vulkan on Android:<br>
656e30b6860461b2bd725590488126<wbr>d5e7e10ec1<br>
<br>
So we've been staying on commit before that for now. I've been busy on other things so haven't taken much look. I only did try to add "-Wl,--build-id=sha1" to LOCAL_LDFLAGS for vulkan library but that alone does not fix it. I can make required build system changes after I get that mystery solved.</blockquote><div><br></div><div>Besides this issue, also 8e03250fcf4fc5de31e92ca4919959d932888a69</div><div>"vulkan: Combine wsi and util makefiles" requires changes/an Android.mk makefile</div><div><br></div><div>Regarding the -o argument,</div><div> it is indeed essential for Android Build System that generated sources/headers</div><div>go in $(OUT)/gen/{EXECUTABLE,{SHARED,STATIC}_LIBRARIES}/[module]_intermediates</div><div>so the possibility to direct the generated files is needed,</div><div>but at this point I'm not even sure Android Build System will not complain,</div><div>I need to check.</div><div><br></div><div>Mauro</div></div></div></div>