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

Commit 488d4478 authored by Dominic Binks's avatar Dominic Binks Committed by Steve Kondik
Browse files

Make libGLES_android.so use coprocessor for TLS

libGLES_android.so was not picking up the ARCH_ARM_HAVE_TLS_REGISTER
variable and so was using the magic 0xffff0ff0 address.  This change
corrects that problem so that if the target has a coprocessor this
is used.

Change-Id: Iaac7f19e60a533c00f9015e1b3a269ac772ebf60
parent 4bc3cef7
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ ifeq ($(LIBAGL_USE_GRALLOC_COPYBITS),1)
    LOCAL_SHARED_LIBRARIES += libui
endif

ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif


LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
LOCAL_MODULE:= libGLES_android
+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static inline gl_hooks_t const * volatile * get_tls_hooks() {

static inline void setGlThreadSpecific(gl_hooks_t const *value) {
    gl_hooks_t const * volatile * tls_hooks = get_tls_hooks();
    LOGD("Setting TLS: %p to %p", tls_hooks, value);
    tls_hooks[TLS_SLOT_OPENGL_API] = value;
}