diff options
| author | bohu <bohu@google.com> | 2015-02-03 18:02:30 -0800 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2015-02-03 18:02:30 -0800 |
| commit | d81668725d81d6b3020b08e6fbc72acf3dc1c0c8 (patch) | |
| tree | e60befeecf3f3fc5dbf2b9eeb450cd205b7184dd /emulator/opengl/system/OpenglSystemCommon/ThreadInfo.h | |
| parent | 5afd994147069d77748d5b99791428fc3c0376e3 (diff) | |
| download | sdk-d81668725d81d6b3020b08e6fbc72acf3dc1c0c8.zip sdk-d81668725d81d6b3020b08e6fbc72acf3dc1c0c8.tar.gz sdk-d81668725d81d6b3020b08e6fbc72acf3dc1c0c8.tar.bz2 | |
back port gles fix to api 16
Following CLs are back ported:
717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString
32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API
b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D
2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean
beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states
84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted
89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc
adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length
b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size
641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height
9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully
40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command
7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API
Change-Id: Ia3c18f714812a8c90593c6a0260c92dc18c56da3
Diffstat (limited to 'emulator/opengl/system/OpenglSystemCommon/ThreadInfo.h')
| -rw-r--r-- | emulator/opengl/system/OpenglSystemCommon/ThreadInfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.h b/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.h index 0328733..f59ce2a 100644 --- a/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.h +++ b/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.h @@ -40,10 +40,10 @@ EGLThreadInfo *slow_getEGLThreadInfo(); // We have a dedicated TLS slot in bionic inline EGLThreadInfo* getEGLThreadInfo() { EGLThreadInfo *tInfo = - (EGLThreadInfo *)(((unsigned *)__get_tls())[TLS_SLOT_OPENGL]); + (EGLThreadInfo *)(((uintptr_t *)__get_tls())[TLS_SLOT_OPENGL]); if (!tInfo) { tInfo = slow_getEGLThreadInfo(); - ((uint32_t *)__get_tls())[TLS_SLOT_OPENGL] = (uint32_t)tInfo; + ((uintptr_t *)__get_tls())[TLS_SLOT_OPENGL] = (uintptr_t)tInfo; } return tInfo; } |