Commit e214351b authored by Janne Grunau's avatar Janne Grunau

rename arch specific bitdepth template files

Missed in 46e2a2d0. Arm asm will be hard to template so move them to
the plain source list.

Fix #96.
parent 46e2a2d0
......@@ -28,8 +28,6 @@
#include "src/arm/asm.S"
#if BITDEPTH == 8
.macro avg dst0, dst1, t0, t1, t2, t3
vld1.16 {\t0,\t1}, [r2, :128]!
vld1.16 {\t2,\t3}, [r3, :128]!
......@@ -215,5 +213,3 @@ endfunc
bidir_fn avg
bidir_fn w_avg
bidir_fn mask
#endif /* BITDEPTH == 8 */
......@@ -27,8 +27,6 @@
#include "src/arm/asm.S"
#if BITDEPTH == 8
.macro avg dst, t0, t1
ld1 {\t0\().8h}, [x2], 16
ld1 {\t1\().8h}, [x3], 16
......@@ -233,5 +231,3 @@ endfunc
bidir_fn avg
bidir_fn w_avg
bidir_fn mask
#endif /* BITDEPTH == 8 */
......@@ -83,14 +83,14 @@ if is_asm_enabled
'arm/cpu.c',
)
libdav1d_tmpl_sources += files(
'arm/mc_init.c',
'arm/mc_init_tmpl.c',
)
if host_machine.cpu_family() == 'aarch64'
libdav1d_tmpl_sources += files(
libdav1d_sources += files(
'arm/64/mc.S',
)
elif host_machine.cpu_family().startswith('arm')
libdav1d_tmpl_sources += files(
libdav1d_sources += files(
'arm/32/mc.S',
)
endif
......@@ -101,11 +101,11 @@ if is_asm_enabled
)
libdav1d_tmpl_sources += files(
'x86/ipred_init.c',
'x86/itx_init.c',
'x86/loopfilter_init.c',
'x86/looprestoration_init.c',
'x86/mc_init.c',
'x86/ipred_init_tmpl.c',
'x86/itx_init_tmpl.c',
'x86/loopfilter_init_tmpl.c',
'x86/looprestoration_init_tmpl.c',
'x86/mc_init_tmpl.c',
)
# NASM source files
......
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