fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

android: aco/isel: Move context initialization code to a dedicated file

Browse source 
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 <issor.oruam@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6703>
This commit is contained in:
Mauro Rossi 2020-09-13 14:18:15 +02:00
parent f3150abe5e
commit 16e788416f
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/Android.compiler.mk
View file

@ -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

1
src/amd/Makefile.sources
View file

@ -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 \