android: pan/bi: Use new packing
authorMauro Rossi <issor.oruam@gmail.com>
Thu, 17 Sep 2020 19:16:20 +0000 (21:16 +0200)
committerMauro Rossi <issor.oruam@gmail.com>
Thu, 17 Sep 2020 21:40:45 +0000 (23:40 +0200)
Fixes the following building error:

external/mesa/src/panfrost/bifrost/bi_pack.c:26:10: fatal error: 'bi_generated_pack.h' file not found
         ^~~~~~~~~~~~~~~~~~~~~
1 error generated.

Fixes: 2ff53879 ("pan/bi: Use new packing")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6765>

src/panfrost/Android.bifrost.mk

index 7d3fe48..3d8f9b1 100644 (file)
@@ -71,6 +71,7 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_GENERATED_SOURCES := \
        $(intermediates)/bifrost_nir_algebraic.c \
        $(intermediates)/bifrost_gen_disasms.c \
+       $(intermediates)/bi_generated_pack.h \
        $(MESA_GEN_GLSL_H)
 
 bifrost_nir_algebraic_gen := $(LOCAL_PATH)/bifrost/bifrost_nir_algebraic.py
@@ -88,6 +89,13 @@ $(intermediates)/bifrost_gen_disasms.c: $(bifrost_gen_disasms_deps)
        @mkdir -p $(dir $@)
        $(hide) $(MESA_PYTHON2) $(bifrost_gen_disasms_gen) $< > $@
 
+bi_generated_pack_gen := $(LOCAL_PATH)/bifrost/gen_pack.py
+bi_generated_pack_deps := $(LOCAL_PATH)/bifrost/ISA.xml
+
+$(intermediates)/bi_generated_pack.h: $(bi_generated_pack_deps)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $(bi_generated_pack_gen) $< > $@
+
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
        $(MESA_TOP)/src/panfrost/bifrost/ \