Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a multithreading bug in libagl's EGL." into honeycomb

Browse Source
This commit is contained in:
Jamie Gennis
2011-01-31 13:38:27 -08:00
committed by Android (Google) Code Review
parent e9da0c1de1 ae2aa286af
commit 8df2c42413
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opengl/libagl/egl.cpp
View File

@@ -82,6 +82,11 @@ static GLint getError() {
if (ggl_unlikely(gEGLErrorKey == -1)) if (ggl_unlikely(gEGLErrorKey == -1))
return EGL_SUCCESS; return EGL_SUCCESS;
GLint error = (GLint)pthread_getspecific(gEGLErrorKey); GLint error = (GLint)pthread_getspecific(gEGLErrorKey);
if (error == 0) {
// The TLS key has been created by another thread, but the value for
// this thread has not been initialized.
return EGL_SUCCESS;
}
pthread_setspecific(gEGLErrorKey, (void*)EGL_SUCCESS); pthread_setspecific(gEGLErrorKey, (void*)EGL_SUCCESS);
return error; return error;
} }