[Mesa-dev] [PATCH 25/32] i965: Move gen6_blorp.c to a file that gets recompiled per-gen

[Mauro Rossi]

2016-08-15 18:43 GMT+02:00 Jason Ekstrand <jason at jlekstrand.net>:

>>
>> > ---
>> >  src/mesa/drivers/dri/i965/Makefile.am       |  14 +-
>> >  src/mesa/drivers/dri/i965/Makefile.sources  |   5 +-
>> >  src/mesa/drivers/dri/i965/gen6_blorp.c      | 400
>> > ----------------------------
>> >  src/mesa/drivers/dri/i965/genX_blorp_exec.c | 399
>> > +++++++++++++++++++++++++++
>> >  4 files changed, 416 insertions(+), 402 deletions(-)
>> >  delete mode 100644 src/mesa/drivers/dri/i965/gen6_blorp.c
>> >  create mode 100644 src/mesa/drivers/dri/i965/genX_blorp_exec.c
>> >
>> Humble request: please run the following in your repo (or even with
>> --global)
>> $ git config diff.renames true
>>
>> Mauro, this change will break the Android build. Feel free to cook up
>> a patch so that Jason can squash it here. This way we'll avoid the
>> interment breakage.
>
>
> Sure, I'd love a hunk to squash in.  If it looks reasonably like the ISL
> patches, I should be able to do the copy+pasting for gen7, 7.5, 8, and 9
> throughout the series.

Hi Emil, Jason,

I've finalized and tested the patches to fix android build, I will
send them here as follow-up.

New libmesa_gen{6,7,75,8,9} static libraries modules are generated
with a common set of variables definitions.

For genX_blorp.c source existing i965_dri shared library dependencie
are applicable,
while dependencies on nir and genxml generated headers required to
define static libraries dependencies on libmesa_genxml and
libmesa_nir, to easily get the needed script generated headers,
because android build system will automatically exported those
generated headers.

Build tested successfully with marshmallow-x86

Feel free to merge the 3 patches or pick them separately as you prefer.

Mauro