diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-01-13 06:27:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-13 06:27:45 +0000 |
| commit | a198e1c14d23efd0d3acbe05fab31bf92748f329 (patch) | |
| tree | f499d298ce1bf8e55743dcf1fb2edeb1f94f7cc7 /opengl | |
| parent | 9c22ac77e41b8bbddbb64959acabce3f3a07345d (diff) | |
| parent | 6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a (diff) | |
| download | frameworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.zip frameworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.tar.gz frameworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.tar.bz2 | |
am 6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"
* commit '6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a':
[MIPS] Build libGLES for mips64, mips32r6
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/libagl/fp.cpp | 2 | ||||
| -rw-r--r-- | opengl/libagl/matrix.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 64320cf..4b08749 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -31,7 +31,9 @@ LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S LOCAL_CFLAGS_arm += -fstrict-aliasing +ifndef ARCH_MIPS_REV6 LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S +endif LOCAL_CFLAGS_mips += -fstrict-aliasing # The graphics code can generate division by zero LOCAL_CFLAGS_mips += -mno-check-zero-division diff --git a/opengl/libagl/fp.cpp b/opengl/libagl/fp.cpp index aea4449..a7a4f7b 100644 --- a/opengl/libagl/fp.cpp +++ b/opengl/libagl/fp.cpp @@ -19,7 +19,7 @@ // ---------------------------------------------------------------------------- -#if !defined(__arm__) && !defined(__mips__) +#if !(defined(__arm__) || (defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6)) GGLfixed gglFloatToFixed(float v) { return GGLfixed(floorf(v * 65536.0f + 0.5f)); } diff --git a/opengl/libagl/matrix.h b/opengl/libagl/matrix.h index 5bd717a..cafc119 100644 --- a/opengl/libagl/matrix.h +++ b/opengl/libagl/matrix.h @@ -74,7 +74,7 @@ GLfixed vsquare3(GLfixed a, GLfixed b, GLfixed c) ); return r; -#elif defined(__mips__) +#elif defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6 GLfixed res; int32_t t1,t2,t3; @@ -160,7 +160,7 @@ static inline GLfixed mla3a( GLfixed a0, GLfixed b0, ); return r; -#elif defined(__mips__) +#elif defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6 GLfixed res; int32_t t1,t2; |