From da710571b75db7031b82924ab3ad47eb645ce215 Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 30 Nov 2012 02:51:45 +0200
Subject: mave plugin and core shared includes to single location

---
 plugins/gpu_unai/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/gpu_unai')

diff --git a/plugins/gpu_unai/Makefile b/plugins/gpu_unai/Makefile
index cf2e5d2..994997f 100644
--- a/plugins/gpu_unai/Makefile
+++ b/plugins/gpu_unai/Makefile
@@ -1,5 +1,6 @@
 CFLAGS += -ggdb -Wall -O3 -ffast-math
 CFLAGS += -DREARMED
+CFLAGS += -I../../include
 
 include ../../config.mak
 
-- 
cgit v1.2.3


From 665f33e1e8ce2e40a7939a33075c3bce1c90790c Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 30 Nov 2012 02:53:25 +0200
Subject: improve ARM feature detection

---
 plugins/gpu_unai/gpu_fixedpoint.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/gpu_unai')

diff --git a/plugins/gpu_unai/gpu_fixedpoint.h b/plugins/gpu_unai/gpu_fixedpoint.h
index 03f07d2..e72fda1 100644
--- a/plugins/gpu_unai/gpu_fixedpoint.h
+++ b/plugins/gpu_unai/gpu_fixedpoint.h
@@ -21,6 +21,8 @@
 #ifndef FIXED_H
 #define FIXED_H
 
+#include "arm_features.h"
+
 typedef s32 fixed;
 
 #ifdef GPU_TABLE_10_BITS
@@ -55,7 +57,7 @@ INLINE u32 Log2(u32 _a)
 }
 */
 
-#ifdef __arm__
+#ifdef HAVE_ARMV5
 INLINE u32 Log2(u32 x) { u32 res; asm("clz %0,%1" : "=r" (res) : "r" (x)); return 32-res; }
 #else
 INLINE u32 Log2(u32 x) { u32 i = 0; for ( ; x > 0; ++i, x >>= 1); return i - 1; }
-- 
cgit v1.2.3