Commit 932ed9c0 authored by Eric Anholt's avatar Eric Anholt

vc4: Enable NEON asm on meson cross-builds.

The core Mesa with_asm_arch and USE_ARM_ASM flags are disabled for meson
cross-builds because of the need to run host binaries on the build system.
vc4 doesn't need to do that, so skip with_asm_arch to enable NEON on my
cross-builds.

Fixes: ebcb4c21 ("meson: Enable VC4's NEON assembly support.")
parent 300d3ae8
......@@ -81,8 +81,10 @@ files_libvc4 = files(
'vc4_uniforms.c',
)
vc4_c_args = []
libvc4_neon = []
if with_asm_arch == 'arm'
if host_machine.cpu_family() == 'arm'
libvc4_neon = static_library(
'vc4_neon',
'vc4_tiling_lt_neon.c',
......@@ -91,12 +93,12 @@ if with_asm_arch == 'arm'
],
c_args : '-mfpu=neon',
)
vc4_c_args += '-DUSE_ARM_ASM'
endif
simpenrose_c_args = []
dep_simpenrose = dependency('simpenrose', required : false)
if dep_simpenrose.found()
simpenrose_c_args = '-DUSE_VC4_SIMULATOR'
vc4_c_args += '-DUSE_VC4_SIMULATOR'
endif
libvc4 = static_library(
......@@ -107,7 +109,7 @@ libvc4 = static_library(
inc_gallium_drivers, inc_drm_uapi,
],
link_with: libvc4_neon,
c_args : [c_vis_args, simpenrose_c_args],
c_args : [c_vis_args, vc4_c_args],
cpp_args : [cpp_vis_args],
dependencies : [dep_simpenrose, dep_libdrm, dep_valgrind, idep_nir_headers],
build_by_default : false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment