diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build index 54b165d69db..47de55fb255 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build @@ -82,7 +82,6 @@ if host_machine.cpu_family() == 'arm' c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'], dependencies : vc4_deps, ) - vc4_c_args += '-DUSE_ARM_ASM' endif if dep_simpenrose.found() diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h index b068f739736..1ac635360f2 100644 --- a/src/gallium/drivers/vc4/vc4_tiling.h +++ b/src/gallium/drivers/vc4/vc4_tiling.h @@ -26,6 +26,7 @@ #include #include +#include "util/detect_arch.h" #include "util/macros.h" #include "util/u_cpu_detect.h" @@ -89,7 +90,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride, void *src, uint32_t src_stride, int cpp, const struct pipe_box *box) { -#ifdef USE_ARM_ASM +#if DETECT_ARCH_ARM if (util_get_cpu_caps()->has_neon) { vc4_load_lt_image_neon(dst, dst_stride, src, src_stride, cpp, box); @@ -105,7 +106,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride, void *src, uint32_t src_stride, int cpp, const struct pipe_box *box) { -#ifdef USE_ARM_ASM +#if DETECT_ARCH_ARM if (util_get_cpu_caps()->has_neon) { vc4_store_lt_image_neon(dst, dst_stride, src, src_stride, cpp, box);