diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-13 17:30:54 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-02-13 17:30:54 -0800 |
| commit | 288870ebc3da8121b7a237a53280bd8b931b7a2f (patch) | |
| tree | b5c73c8ed31a810b18e62da2e33f2948b09867f5 /opengl/libs/GLES_CM | |
| parent | 873ab60e94811488caea1906eb98133329a3e28f (diff) | |
| download | frameworks_native-288870ebc3da8121b7a237a53280bd8b931b7a2f.zip frameworks_native-288870ebc3da8121b7a237a53280bd8b931b7a2f.tar.gz frameworks_native-288870ebc3da8121b7a237a53280bd8b931b7a2f.tar.bz2 | |
Simplify OpenGL TLS access on ARM.
bionic now assumes the TLS register is available, so OpenGL can too.
Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
Diffstat (limited to 'opengl/libs/GLES_CM')
| -rw-r--r-- | opengl/libs/GLES_CM/gl.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp index adcb60d..48fd278 100644 --- a/opengl/libs/GLES_CM/gl.cpp +++ b/opengl/libs/GLES_CM/gl.cpp @@ -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 |