ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"

Browse Source 
* commit '6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a':
  [MIPS] Build libGLES for mips64, mips32r6
This commit is contained in:
Brian Carlstrom 2015-01-13 06:27:45 +00:00 committed by Android Git Automerger
commit a198e1c14d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opengl/libagl/Android.mk
View File

@ -31,7 +31,9 @@ LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger
LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S
LOCAL_CFLAGS_arm += -fstrict-aliasing LOCAL_CFLAGS_arm += -fstrict-aliasing
ifndef ARCH_MIPS_REV6
LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S
endif
LOCAL_CFLAGS_mips += -fstrict-aliasing LOCAL_CFLAGS_mips += -fstrict-aliasing
# The graphics code can generate division by zero # The graphics code can generate division by zero
LOCAL_CFLAGS_mips += -mno-check-zero-division LOCAL_CFLAGS_mips += -mno-check-zero-division

2
opengl/libagl/fp.cpp
View File

@ -19,7 +19,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !defined(__arm__) && !defined(__mips__) #if !(defined(__arm__) || (defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6))
GGLfixed gglFloatToFixed(float v) { GGLfixed gglFloatToFixed(float v) {
return GGLfixed(floorf(v * 65536.0f + 0.5f)); return GGLfixed(floorf(v * 65536.0f + 0.5f));
} }

4
opengl/libagl/matrix.h
View File

@ -74,7 +74,7 @@ GLfixed vsquare3(GLfixed a, GLfixed b, GLfixed c)
); );
return r; return r;
#elif defined(__mips__) #elif defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
GLfixed res; GLfixed res;
int32_t t1,t2,t3; int32_t t1,t2,t3;
@ -160,7 +160,7 @@ static inline GLfixed mla3a( GLfixed a0, GLfixed b0,
); );
return r; return r;
#elif defined(__mips__) #elif defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
GLfixed res; GLfixed res;
int32_t t1,t2; int32_t t1,t2;