diff options
| author | 2014-01-24 16:42:36 -0800 | |
|---|---|---|
| committer | 2014-01-24 16:42:36 -0800 | |
| commit | e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c (patch) | |
| tree | 1f2766b57b911c22e08c19dd25ba79a6e85501d2 /opengl/libagl/context.h | |
| parent | e5f7bf7471b21226c9a6b875e9e8f2fb2cba72e2 (diff) | |
| parent | af29b77ab7dab5a1b5af27e7f7eeeb14584c101c (diff) | |
am af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit 'af29b77ab7dab5a1b5af27e7f7eeeb14584c101c':
libGLES_android: fix 64-bit compile errors
Diffstat (limited to 'opengl/libagl/context.h')
| -rw-r--r-- | opengl/libagl/context.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/opengl/libagl/context.h b/opengl/libagl/context.h index 7065a30324..c599a55aaf 100644 --- a/opengl/libagl/context.h +++ b/opengl/libagl/context.h @@ -147,7 +147,11 @@ struct vertex_t { vec4_t color; vec4_t texture[GGL_TEXTURE_UNIT_COUNT]; +#ifdef __LP64__ + uint32_t reserved1[2]; +#else uint32_t reserved1[4]; +#endif inline void clear() { flags = index = locked = mru = 0; @@ -578,10 +582,10 @@ private: #ifdef HAVE_ANDROID_OS // We have a dedicated TLS slot in bionic inline void setGlThreadSpecific(ogles_context_t *value) { - ((uint32_t *)__get_tls())[TLS_SLOT_OPENGL] = (uint32_t)value; + __get_tls()[TLS_SLOT_OPENGL] = value; } inline ogles_context_t* getGlThreadSpecific() { - return (ogles_context_t *)(((unsigned *)__get_tls())[TLS_SLOT_OPENGL]); + return static_cast<ogles_context_t*>(__get_tls()[TLS_SLOT_OPENGL]); } #else extern pthread_key_t gGLKey; |