diff options
| author | Eric Anholt <[email protected]> | 2017-11-08 14:07:38 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2017-11-09 09:40:30 -0800 |
| commit | ebcb4c2156e9c0900fce6ee9ce6e3bd7894f7953 (patch) | |
| tree | 1b761dbfc7978b142bfb875d70aa4c0ae659160a | |
| parent | 9c9fd8ff3792897a5fe3c3998274e59fa95d4d76 (diff) | |
meson: Enable VC4's NEON assembly support.
Reviewed-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Tested-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/meson.build | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/meson.build b/meson.build index ce97fa95af7..ddd76804c54 100644 --- a/meson.build +++ b/meson.build @@ -489,8 +489,8 @@ endif # FIXME: enable asm when cross compiler # This is doable (autotools does it), but it's not of immediate concern -if meson.is_cross_build() - message('Cross compiling, disabling asm') +if meson.is_cross_build() and host_machine.cpu_family().startswith('x86') + message('Cross compiling, disabling x86/x86_64 asm') with_asm = false endif diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build index 38b47fbdd97..572d4b4fa9a 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build @@ -81,6 +81,18 @@ files_libvc4 = files( 'vc4_uniforms.c', ) +libvc4_neon = [] +if with_asm_arch == 'arm' + libvc4_neon = static_library( + 'vc4_neon', + 'vc4_tiling_lt_neon.c', + include_directories : [ + inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom + ], + c_args : '-mfpu=neon', + ) +endif + simpenrose_c_args = [] dep_simpenrose = dependency('simpenrose', required : false) if dep_simpenrose.found() @@ -94,6 +106,7 @@ libvc4 = static_library( inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_drivers, inc_drm_uapi, ], + link_with: libvc4_neon, c_args : [c_vis_args, simpenrose_c_args], cpp_args : [cpp_vis_args], dependencies : [dep_simpenrose, dep_libdrm, dep_valgrind], |