From 16e788416f05ac3347af99e0715e96e42f616be8 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sun, 13 Sep 2020 14:18:15 +0200 Subject: [PATCH] android: aco/isel: Move context initialization code to a dedicated file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes are necessary to properly build libmesa_aco static library for Android. was removed in 47de55328 "aco/isel: Move context initialization code to a dedicated file" so filter-out of aco_instruction_selection_setup.cpp in Android is removed. Fixes the following building errors: FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/vulkan.radv_intermediates/LINKED/vulkan.radv.so ... ld.lld: error: undefined symbol: aco::setup_isel_context(aco::Program*, unsigned int, nir_shader* const*, ac_shader_config*, radv_shader_args*, bool) >>> referenced by aco_instruction_selection.cpp:10879 (external/mesa/src/amd/compiler/aco_instruction_selection.cpp:10879) >>> aco_instruction_selection.o:(aco::select_program(aco::Program*, unsigned int, nir_shader* const*, ac_shader_config*, radv_shader_args*)) in archive out/target/product/x86_64/obj/STATIC_LIBRARIES/libmesa_aco_intermediates/libmesa_aco.a ... ld.lld: error: undefined symbol: aco::init_context(aco::isel_context*, nir_shader*) >>> referenced by aco_instruction_selection.cpp:10885 (external/mesa/src/amd/compiler/aco_instruction_selection.cpp:10885) >>> aco_instruction_selection.o:(aco::select_program(aco::Program*, unsigned int, nir_shader* const*, ac_shader_config*, radv_shader_args*)) in archive out/target/product/x86_64/obj/STATIC_LIBRARIES/libmesa_aco_intermediates/libmesa_aco.a Fixes: 47de55328 ("aco/isel: Move context initialization code to a dedicated file") Signed-off-by: Mauro Rossi Reviewed-by: Daniel Schürmann Part-of: --- src/amd/Android.compiler.mk | 4 +--- src/amd/Makefile.sources | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/amd/Android.compiler.mk b/src/amd/Android.compiler.mk index 3f544ac3cf1..7d4a1ea4381 100644 --- a/src/amd/Android.compiler.mk +++ b/src/amd/Android.compiler.mk @@ -32,10 +32,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmesa_aco -# filter-out compiler/aco_instruction_selection_setup.cpp because -# it's already included by compiler/aco_instruction_selection.cpp LOCAL_SRC_FILES := \ - $(filter-out compiler/aco_instruction_selection_setup.cpp, $(ACO_FILES)) + $(ACO_FILES) LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions diff --git a/src/amd/Makefile.sources b/src/amd/Makefile.sources index 17e5fcbd0a7..aa029731569 100644 --- a/src/amd/Makefile.sources +++ b/src/amd/Makefile.sources @@ -78,6 +78,7 @@ ACO_FILES = \ compiler/aco_dead_code_analysis.cpp \ compiler/aco_dominance.cpp \ compiler/aco_instruction_selection.cpp \ + compiler/aco_instruction_selection.h \ compiler/aco_instruction_selection_setup.cpp \ compiler/aco_interface.cpp \ compiler/aco_interface.h \