Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a198e1c1 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

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

* commit '6f9c6541':
  [MIPS] Build libGLES for mips64, mips32r6
parents 9c22ac77 6f9c6541

opengl/libagl/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

opengl/libagl/fp.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));

}

opengl/libagl/matrix.h

+2 −2
Original line number Diff line number Diff line
@@ -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;