[Mesa-dev] [RESEND 08/13] anv: generate anv_entrypoints.{h, c} in one command

[Tapani Pälli]

On 02/23/2017 12:32 PM, Emil Velikov wrote:
> On 22 February 2017 at 23:35, Dylan Baker <dylan at pnwbakers.com> wrote:
>> This changes the python generator to write the files itself, rather than
>> piping them out. This has a couple of advantages: first, it encapsulates
>> the encoding. Second, it ensures that the header file and code file are
>> generated at the same time with the same data.
>>
> Last time there were some serious objections to doing this. Glad that
> you got those covered ;-)
>
>> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
>> ---
>>  src/intel/vulkan/Makefile.am            |  7 ++----
>>  src/intel/vulkan/anv_entrypoints_gen.py | 38 ++++++++++++---------------------
>>  2 files changed, 16 insertions(+), 29 deletions(-)
>>
>> diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
>> index 5a0e4ef4ff..68bc5ccf86 100644
>> --- a/src/intel/vulkan/Makefile.am
>> +++ b/src/intel/vulkan/Makefile.am
>> @@ -145,11 +145,8 @@ libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)
>>
>>  vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
>>
>> -anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_api_xml)
>> -       $(AM_V_GEN)$(PYTHON2) $(srcdir)/anv_entrypoints_gen.py header > $@
>> -
>> -anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_api_xml)
>> -       $(AM_V_GEN)$(PYTHON2) $(srcdir)/anv_entrypoints_gen.py code > $@
>> +anv_entrypoints.h anv_entrypoints.c: anv_entrypoints_gen.py $(vulkan_api_xml)
>> +       $(AM_V_GEN)$(PYTHON2) $(srcdir)/anv_entrypoints_gen.py
>>
> Please pass a "-o $dst_dir" type of argument. It will be/is broken otherwise.
>
> Small suggestion to update the Android.mk file. Feel free to Cc
> Tapani/Mauro so that they can test/address any concerns.
>
> Mauro, Tapani,
> Afaict earlier series [1] have broken things on your end, but do
> suggest some fixes that one can squash with this batch.

introduction of 'build-id' usage broke Vulkan on Android:
656e30b6860461b2bd725590488126d5e7e10ec1

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.


> Thanks
> Emil
>
> [1]
> e9dcb17962f7e58a81c93bae7bd33885675b1043
> 8e03250fcf4fc5de31e92ca4919959d932888a69
>