Skip to content

android: aco: use python3 for script generated sources

maurossi requested to merge issor.oruam/mesa:android_aco_w18 into master

Commit 2ab45f41 ("aco: implement sub-dword swaps") introduced f-strings and now python3 is required to build aco

Fixes the following building error:

FAILED: out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_aco_intermediates/compiler/aco_opcodes.cpp
/bin/bash -c "/usr/bin/python external/mesa/src/amd/compiler/aco_opcodes_cpp.py > out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_aco_intermediates/compiler/aco_opcodes.cpp || ( out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_aco_intermediates/compiler/aco_opcodes.cpp; false)"
Traceback (most recent call last):
  File "external/mesa/src/amd/compiler/aco_opcodes_cpp.py", line 73, in <module>
    from aco_opcodes import opcodes
  File "external/mesa/src/amd/compiler/aco_opcodes.py", line 156
    res += f'instr->sel[{i}] = op{i}.op.bytes() == 2 ? sdwa_uword : (op{i}.op.bytes() == 1 ? sdwa_ubyte : sdwa_udword);\n'
                                                                                                                         ^
SyntaxError: invalid syntax

Fixes: 2ab45f41 ("aco: implement sub-dword swaps") Signed-off-by: Mauro Rossi issor.oruam@gmail.com

Edited by maurossi

Merge request reports