diff options
| author | Roman Stratiienko <[email protected]> | 2019-08-06 10:23:45 +0300 |
|---|---|---|
| committer | Roman Stratiienko <[email protected]> | 2019-08-08 17:47:22 +0000 |
| commit | 28061e0ab03dcbcaad32c66fa8f427d94a09c5a0 (patch) | |
| tree | 0405f4ff9c12615e4033dfd97b8a139b7c45d242 /src/gallium/drivers/lima | |
| parent | 26a01a67971cc773ae2396d58e4606d40d998950 (diff) | |
lima: Fix Android.mk
1. Update LOCAL_SRC_FILES according to commit
54434fe67068 ("lima/gpir: Rework the scheduler").
2. Add libpanfrost_shared.a dependency.
3. Generate lima_nir_algebraic.c with Android.mk
Fixes Android build error introduced by commit 5adfc8602c63
("lima/ppir: move sin/cos input scaling into NIR")
Signed-off-by: Roman Stratiienko <[email protected]>
Reviewed-by: Vasily Khoruzhick <[email protected]>
Acked-by: Qiang Yu <[email protected]>
Diffstat (limited to 'src/gallium/drivers/lima')
| -rw-r--r-- | src/gallium/drivers/lima/Android.mk | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/gallium/drivers/lima/Android.mk b/src/gallium/drivers/lima/Android.mk index 516e714deff..069ecc4b23c 100644 --- a/src/gallium/drivers/lima/Android.mk +++ b/src/gallium/drivers/lima/Android.mk @@ -31,10 +31,9 @@ LOCAL_SRC_FILES := \ ir/gp/lower.c \ ir/gp/nir.c \ ir/gp/node.c \ - ir/gp/physical_regalloc.c \ + ir/gp/regalloc.c \ ir/gp/reduce_scheduler.c \ ir/gp/scheduler.c \ - ir/gp/value_regalloc.c \ ir/lima_ir.h \ ir/lima_nir_lower_uniform_to_scalar.c \ ir/pp/codegen.c \ @@ -74,7 +73,21 @@ LOCAL_MODULE := libmesa_pipe_lima LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_STATIC_LIBRARIES := libmesa_nir +LOCAL_STATIC_LIBRARIES := \ + libmesa_nir \ + libpanfrost_shared \ + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES + +intermediates := $(call local-generated-sources-dir) + +$(intermediates)/lima_nir_algebraic.c: $(LOCAL_PATH)/ir/lima_nir_algebraic.py + @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir/ > $@ + +LOCAL_GENERATED_SOURCES := \ + $(intermediates)/lima_nir_algebraic.c \ include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |