From 7a7b66ab341e8c9faa9cce007c53a502df5b5bb1 Mon Sep 17 00:00:00 2001
From: Rodger Combs <rodger.combs@gmail.com>
Date: Sun, 31 Jan 2016 08:07:35 -0600
Subject: Initial messy ARM ASM work

---
 libass/ass_func_template.h | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'libass/ass_func_template.h')

diff --git a/libass/ass_func_template.h b/libass/ass_func_template.h
index 0eccdfb7..6f4755ea 100644
--- a/libass/ass_func_template.h
+++ b/libass/ass_func_template.h
@@ -93,10 +93,18 @@ void DECORATE(blur1246_vert)(int16_t *dst, const int16_t *src,
                              uintptr_t src_width, uintptr_t src_height,
                              const int16_t *param);
 
-
 const BitmapEngine DECORATE(bitmap_engine) = {
     .align_order = ALIGN,
 
+#ifdef __arm__
+#undef DECORATE
+#define DECORATE(func) ass_##func##_c
+#endif
+
+#ifndef DECORATE2
+#define DECORATE2(x) DECORATE(x)
+#endif
+
 #if CONFIG_RASTERIZER
 #if CONFIG_LARGE_TILES
     .tile_order = 5,
@@ -111,10 +119,10 @@ const BitmapEngine DECORATE(bitmap_engine) = {
 #endif
 #endif
 
-    .add_bitmaps = DECORATE(add_bitmaps),
-#ifdef __x86_64__
-    .sub_bitmaps = DECORATE(sub_bitmaps),
-    .mul_bitmaps = DECORATE(mul_bitmaps),
+    .add_bitmaps = DECORATE2(add_bitmaps),
+#if defined(__x86_64__) || defined(__arm__)
+    .sub_bitmaps = DECORATE2(sub_bitmaps),
+    .mul_bitmaps = DECORATE2(mul_bitmaps),
 #else
     .sub_bitmaps = ass_sub_bitmaps_c,
     .mul_bitmaps = ass_mul_bitmaps_c,
@@ -139,3 +147,5 @@ const BitmapEngine DECORATE(bitmap_engine) = {
     .main_blur_horz = { DECORATE(blur1234_horz), DECORATE(blur1235_horz), DECORATE(blur1246_horz) },
     .main_blur_vert = { DECORATE(blur1234_vert), DECORATE(blur1235_vert), DECORATE(blur1246_vert) },
 };
+
+#undef DECORATE2
-- 
cgit v1.2.3