From a92a483ff7feee1a903fd1f4caab9c2a035882b8 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 9 May 2020 13:59:02 +0200 Subject: [PATCH] freedreno: android: add adreno-pm4-pack.xml.h generation to android build Fixes the following building errors: In file included from external/mesa/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c:40: external/mesa/src/gallium/drivers/freedreno/a6xx/fd6_pack.h:42:10: fatal error: 'adreno-pm4-pack.xml.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. In file included from external/mesa/src/gallium/drivers/freedreno/a6xx/fd6_blend.c:36: external/mesa/src/gallium/drivers/freedreno/a6xx/fd6_pack.h:42:10: fatal error: 'adreno-pm4-pack.xml.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. In file included from external/mesa/src/gallium/drivers/freedreno/a6xx/fd6_const.c:26: external/mesa/src/gallium/drivers/freedreno/a6xx/fd6_pack.h:42:10: fatal error: 'adreno-pm4-pack.xml.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Fixes: ee293160 "freedreno/a6xx: add OUT_PKT()" Signed-off-by: Mauro Rossi Part-of: --- src/freedreno/Android.registers.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/freedreno/Android.registers.mk b/src/freedreno/Android.registers.mk index 639201a3b5a..190e4483b5f 100644 --- a/src/freedreno/Android.registers.mk +++ b/src/freedreno/Android.registers.mk @@ -44,7 +44,7 @@ $(intermediates)/dummy.c: # This is the list of auto-generated files headers LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/registers/, \ - a2xx.xml.h a3xx.xml.h a4xx.xml.h a5xx.xml.h a6xx.xml.h a6xx-pack.xml.h adreno_common.xml.h adreno_pm4.xml.h) + a2xx.xml.h a3xx.xml.h a4xx.xml.h a5xx.xml.h a6xx.xml.h a6xx-pack.xml.h adreno_common.xml.h adreno_pm4.xml.h adreno-pm4-pack.xml.h) $(intermediates)/registers/a2xx.xml.h: $(LOCAL_PATH)/registers/a2xx.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py @mkdir -p $(dir $@) @@ -86,6 +86,10 @@ $(intermediates)/registers/adreno_pm4.xml.h: $(LOCAL_PATH)/registers/adreno_pm4. @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $< > $@ +$(intermediates)/registers/adreno-pm4-pack.xml.h: $(LOCAL_PATH)/registers/adreno_pm4.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py + @mkdir -p $(dir $@) + @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" + $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $< --pack-structs > $@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(intermediates)/registers/ -- 2.30.2