Hi,
there are more issues to resove with gfx10 new code,
this patch does not suffice.
I am sending a separate series with updated patches.
I added Nicolai and Marek because some of their commits need those fixes.
Please follow the new thread
Mauro
On Sat, Jul 6, 2019 at 4:01 PM Mauro Rossi <issor.or...@gmail.com> wrote:
> Fix Android building rules for gfx10_format_table.h generated header
>
> Fixes: 0ffa229 ("radeonsi/gfx10: generate gfx10_format_table.h")
> Signed-off-by: Mauro Rossi <issor.or...@gmail.com>
> ---
> src/gallium/drivers/radeonsi/Android.mk | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/src/gallium/drivers/radeonsi/Android.mk
> b/src/gallium/drivers/radeonsi/Android.mk
> index 76309a4ebc..efdcec8ab9 100644
> --- a/src/gallium/drivers/radeonsi/Android.mk
> +++ b/src/gallium/drivers/radeonsi/Android.mk
> @@ -61,6 +61,20 @@ $(intermediates)/radeonsi/si_driinfo.h:
> $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
> @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
> $(hide) $(MESA_PYTHON2) $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) >
> $@ || ($(RM) $@; false)
>
> +GEN10_FORMAT_TABLE_INPUTS := \
> + $(MESA_TOP)/src/gallium/auxiliary/util/u_format.csv \
> + $(MESA_TOP)/src/amd/registers/gfx10-rsrc.json
> +
> +GEN10_FORMAT_TABLE_DEP := \
> + $(MESA_TOP)/src/amd/registers/regdb.py
> +
> +GEN10_FORMAT_TABLE := $(LOCAL_PATH)/gfx10_format_table.py
> +
> +$(intermediates)/radeonsi/gfx10_format_table.h: $(GEN10_FORMAT_TABLE)
> $(GEN10_FORMAT_TABLE_INPUTS) $(GEN10_FORMAT_TABLE_DEP)
> + @mkdir -p $(dir $@)
> + @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
> + $(hide) $(MESA_PYTHON2) $(GEN10_FORMAT_TABLE)
> $(GEN10_FORMAT_TABLE_INPUTS) > $@ || ($(RM) $@; false)
> +
> LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
>
> $(call mesa-build-with-llvm)
> --
> 2.20.1
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
