From ba3d2c3a4c2a25feae627c548d518eb6c33e2013 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Thu, 14 Jan 2021 23:15:56 +0100 Subject: [PATCH] android: r600/sfn: add sfn_nir_lower_64bit.cpp to Makefile.sources Fixes the following building errors: FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so ... ld.lld: error: undefined symbol: r600::r600_nir_split_64bit_io(nir_shader*) >>> referenced by sfn_nir.cpp:981 (external/mesa/src/gallium/drivers/r600/sfn/sfn_nir.cpp:981) ... ld.lld: error: undefined symbol: r600::r600_nir_64_to_vec2(nir_shader*) >>> referenced by sfn_nir.cpp:1010 (external/mesa/src/gallium/drivers/r600/sfn/sfn_nir.cpp:1010) ... ld.lld: error: undefined symbol: r600::r600_merge_vec2_stores(nir_shader*) >>> referenced by sfn_nir.cpp:1015 (external/mesa/src/gallium/drivers/r600/sfn/sfn_nir.cpp:1015) Fixes: 165fb5117b ("r600/sfn: add lowering passes to get 64 bit ops lowered to 32 bit vec2") Cc: 21.0 Signed-off-by: Mauro Rossi Reviewed-by: Gert Wollny Part-of: (cherry picked from commit 4bc9f7d53fa8941080a571b485563cabe2973349) --- .pick_status.json | 2 +- src/gallium/drivers/r600/Makefile.sources | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 69d321f4cfb..c6ae0447e18 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -319,7 +319,7 @@ "description": "android: r600/sfn: add sfn_nir_lower_64bit.cpp to Makefile.sources", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "165fb5117bf70402e66d34538d4085e060f57fea" }, diff --git a/src/gallium/drivers/r600/Makefile.sources b/src/gallium/drivers/r600/Makefile.sources index 28f2319241a..63079602188 100644 --- a/src/gallium/drivers/r600/Makefile.sources +++ b/src/gallium/drivers/r600/Makefile.sources @@ -132,6 +132,7 @@ CXX_SOURCES = \ sfn/sfn_liverange.h \ sfn/sfn_nir.cpp \ sfn/sfn_nir.h \ + sfn/sfn_nir_lower_64bit.cpp \ sfn/sfn_nir_lower_fs_out_to_vector.cpp \ sfn/sfn_nir_lower_fs_out_to_vector.h \ sfn/sfn_nir_lower_tess_io.cpp \