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

Commit 45b0e435 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Simplify OpenGL TLS access on ARM."

parents 873ab60e 288870eb

opengl/libagl/Android.mk

+0 −9
Original line number Diff line number Diff line
@@ -34,16 +34,7 @@ ifeq ($(TARGET_ARCH),arm) 
	LOCAL_CFLAGS += -fstrict-aliasing

endif



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

    LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif



# we need to access the private Bionic header <bionic_tls.h>

# on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER

# behavior from the bionic Android.mk file

ifeq ($(TARGET_ARCH)-$(ARCH_ARM_HAVE_TLS_REGISTER),arm-true)

    LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif

LOCAL_C_INCLUDES += bionic/libc/private



LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl

opengl/libs/Android.mk

+0 −23
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ LOCAL_LDLIBS := -lpthread -ldl 
LOCAL_MODULE:= libEGL

LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL

LOCAL_SHARED_LIBRARIES += libdl

# Bionic's private TLS header relies on the ARCH_ARM_HAVE_TLS_REGISTER to

# select the appropriate TLS codepath

ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

    LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif

# we need to access the private Bionic header <bionic_tls.h>

LOCAL_C_INCLUDES += bionic/libc/private
@@ -49,10 +44,6 @@ ifeq ($(TARGET_BOARD_PLATFORM), s5pc110) 
  LOCAL_CFLAGS += -DSYSTEMUI_PBSIZE_HACK=1

endif



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif



ifneq ($(MAX_EGL_CACHE_ENTRY_SIZE),)

  LOCAL_CFLAGS += -DMAX_EGL_CACHE_ENTRY_SIZE=$(MAX_EGL_CACHE_ENTRY_SIZE)

endif
@@ -100,19 +91,12 @@ LOCAL_MODULE:= libGLESv1_CM 


LOCAL_SHARED_LIBRARIES += libdl

# we need to access the private Bionic header <bionic_tls.h>

ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

    LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif

LOCAL_C_INCLUDES += bionic/libc/private



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)
@@ -132,19 +116,12 @@ LOCAL_MODULE:= libGLESv2 


LOCAL_SHARED_LIBRARIES += libdl

# we need to access the private Bionic header <bionic_tls.h>

ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

    LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif

LOCAL_C_INCLUDES += bionic/libc/private



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/EGL/getProcAddress.cpp

+1 −8
Original line number Diff line number Diff line
@@ -37,14 +37,7 @@ 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 GET_TLS(reg) "mrc p15, 0, " #reg ", c13, c0, 3 \n"



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

opengl/libs/GLES2/gl2.cpp

+1 −8
Original line number Diff line number Diff line
@@ -41,14 +41,7 @@ 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 GET_TLS(reg) "mrc p15, 0, " #reg ", c13, c0, 3 \n"



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

opengl/libs/GLES_CM/gl.cpp

+1 −8
Original line number Diff line number Diff line
@@ -97,14 +97,7 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(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 GET_TLS(reg) "mrc p15, 0, " #reg ", c13, c0, 3 \n"



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