Merge commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6' into eclair-mr2-plus-aosp * commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6': Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
This commit is contained in:
@ -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)
|
||||
|
@ -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" \
|
||||
|
@ -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" \
|
||||
|
Reference in New Issue
Block a user