summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorDuane Sand2014-11-25 18:43:13 -0600
committerBrian Carlstrom2015-01-13 00:18:13 -0600
commit81c6d66a1daf740109eaaa10953a592907087e96 (patch)
tree9c61fe65d43275e10a22d34441a274eec7243df1 /opengl
parent96e4409e8c38b1d79285eca9886d44ff850b5748 (diff)
downloadframeworks-native-81c6d66a1daf740109eaaa10953a592907087e96.tar.gz
frameworks-native-81c6d66a1daf740109eaaa10953a592907087e96.tar.xz
frameworks-native-81c6d66a1daf740109eaaa10953a592907087e96.zip
[MIPS] Build libGLES for mips64, mips32r6
For now, use generic C code instead of assembler. Change-Id: I604ecdcde2d5373f1f68ab97a63a80667b630846
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libagl/Android.mk2
-rw-r--r--opengl/libagl/fp.cpp2
-rw-r--r--opengl/libagl/matrix.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk
index 64320cf75..4b08749b2 100644
--- a/opengl/libagl/Android.mk
+++ b/opengl/libagl/Android.mk
@@ -31,7 +31,9 @@ LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger
31LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S 31LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S
32LOCAL_CFLAGS_arm += -fstrict-aliasing 32LOCAL_CFLAGS_arm += -fstrict-aliasing
33 33
34ifndef ARCH_MIPS_REV6
34LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S 35LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S
36endif
35LOCAL_CFLAGS_mips += -fstrict-aliasing 37LOCAL_CFLAGS_mips += -fstrict-aliasing
36# The graphics code can generate division by zero 38# The graphics code can generate division by zero
37LOCAL_CFLAGS_mips += -mno-check-zero-division 39LOCAL_CFLAGS_mips += -mno-check-zero-division
diff --git a/opengl/libagl/fp.cpp b/opengl/libagl/fp.cpp
index aea44493e..a7a4f7b10 100644
--- a/opengl/libagl/fp.cpp
+++ b/opengl/libagl/fp.cpp
@@ -19,7 +19,7 @@
19 19
20// ---------------------------------------------------------------------------- 20// ----------------------------------------------------------------------------
21 21
22#if !defined(__arm__) && !defined(__mips__) 22#if !(defined(__arm__) || (defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6))
23GGLfixed gglFloatToFixed(float v) { 23GGLfixed gglFloatToFixed(float v) {
24 return GGLfixed(floorf(v * 65536.0f + 0.5f)); 24 return GGLfixed(floorf(v * 65536.0f + 0.5f));
25} 25}
diff --git a/opengl/libagl/matrix.h b/opengl/libagl/matrix.h
index 5bd717aed..cafc11905 100644
--- a/opengl/libagl/matrix.h
+++ b/opengl/libagl/matrix.h
@@ -74,7 +74,7 @@ GLfixed vsquare3(GLfixed a, GLfixed b, GLfixed c)
74 ); 74 );
75 return r; 75 return r;
76 76
77#elif defined(__mips__) 77#elif defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
78 78
79 GLfixed res; 79 GLfixed res;
80 int32_t t1,t2,t3; 80 int32_t t1,t2,t3;
@@ -160,7 +160,7 @@ static inline GLfixed mla3a( GLfixed a0, GLfixed b0,
160 ); 160 );
161 return r; 161 return r;
162 162
163#elif defined(__mips__) 163#elif defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
164 164
165 GLfixed res; 165 GLfixed res;
166 int32_t t1,t2; 166 int32_t t1,t2;