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

Commit dcf9e8cf authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined 

Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-mr2

* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
  Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
parents feb09597 673d2dba

opengl/libs/Android.mk

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm7k) 
LOCAL_CFLAGS += -DADRENO130=1

endif



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif



include $(BUILD_SHARED_LIBRARY)

installed_libEGL := $(LOCAL_INSTALLED_MODULE)
@@ -78,6 +82,10 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\" 
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

LOCAL_CFLAGS += -fvisibility=hidden



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif



include $(BUILD_SHARED_LIBRARY)
@@ -107,4 +115,8 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\" 
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

LOCAL_CFLAGS += -fvisibility=hidden



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif



include $(BUILD_SHARED_LIBRARY)

opengl/libs/GLES2/gl2.cpp

+11 −3
Original line number Diff line number Diff line
@@ -41,12 +41,20 @@ using namespace android; 


#if USE_FAST_TLS_KEY



    #ifdef HAVE_ARM_TLS_REGISTER

        #define GET_TLS(reg) \

            "mrc p15, 0, " #reg ", c13, c0, 3 \n"

    #else

        #define GET_TLS(reg) \

            "mov   " #reg ", #0xFFFF0FFF      \n"  \

            "ldr   " #reg ", [" #reg ", #-15] \n"

    #endif



    #define API_ENTRY(_api) __attribute__((naked)) _api



    #define CALL_GL_API(_api, ...)                              \

         asm volatile(                                          \

            "mov   r12, #0xFFFF0FFF   \n"                       \

            "ldr   r12, [r12, #-15]   \n"                       \

            GET_TLS(r12)                                        \

            "ldr   r12, [r12, %[tls]] \n"                       \

            "cmp   r12, #0            \n"                       \

            "ldrne pc,  [r12, %[api]] \n"                       \

opengl/libs/GLES_CM/gl.cpp

+11 −3
Original line number Diff line number Diff line
@@ -76,12 +76,20 @@ void glVertexPointerBounds(GLint size, GLenum type, 


#if USE_FAST_TLS_KEY && !CHECK_FOR_GL_ERRORS



    #ifdef HAVE_ARM_TLS_REGISTER

        #define GET_TLS(reg) \

            "mrc p15, 0, " #reg ", c13, c0, 3 \n"

    #else

        #define GET_TLS(reg) \

            "mov   " #reg ", #0xFFFF0FFF      \n"  \

            "ldr   " #reg ", [" #reg ", #-15] \n"

    #endif



    #define API_ENTRY(_api) __attribute__((naked)) _api



    #define CALL_GL_API(_api, ...)                              \

         asm volatile(                                          \

            "mov   r12, #0xFFFF0FFF   \n"                       \

            "ldr   r12, [r12, #-15]   \n"                       \

            GET_TLS(r12)                                        \

            "ldr   r12, [r12, %[tls]] \n"                       \

            "cmp   r12, #0            \n"                       \

            "ldrne pc,  [r12, %[api]] \n"                       \