diff options
| author | 2014-01-25 00:44:54 +0000 | |
|---|---|---|
| committer | 2014-01-25 00:44:54 +0000 | |
| commit | dd00090530340de22ca60f79446b5fe3050cd95f (patch) | |
| tree | d382f32466adfd949c09d6c6d3de8a1ffe5d764e /opengl/libagl/context.h | |
| parent | 03691218ada2fb7e084ad4ae7ddd54f9b28d5611 (diff) | |
| parent | e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c (diff) | |
am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit 'e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c':
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; |