From 2434fb3e8e4c9c93b5755af34f077d2bf767b5f3 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 6 Jul 2019 21:27:21 +0200 Subject: [PATCH] android: radeonsi/gfx10: generate gfx10_format_table.h (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix Android building rules for gfx10_format_table.h generated header (v2) Add LOCAL_C_INCLUDES += $(intermediates)/radeonsi to fix error: external/mesa/src/gallium/drivers/radeonsi/si_state.c:46:10: fatal error: 'gfx10_format_table.h' file not found ^~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Fixes: 0ffa229 ("radeonsi/gfx10: generate gfx10_format_table.h") Signed-off-by: Mauro Rossi Acked-by: Marek Olšák --- src/gallium/drivers/radeonsi/Android.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index 76309a4ebc2..e402da639e7 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -61,6 +61,22 @@ $(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_C_INCLUDES += $(intermediates)/radeonsi + LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) $(call mesa-build-with-llvm) -- 2.30.2