diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-13 14:27:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-13 14:27:36 -0700 |
| commit | 5e1bf8d4faabb9acd35fe969effe5ca541298737 (patch) | |
| tree | 02b0b5cbeb123ee7e22a07161133206657614878 /opengl | |
| parent | 024c8705bb0bc392dbec31c85652dbba14233c32 (diff) | |
| parent | f285cb097506d588a17cf1096fcd09e980562bfc (diff) | |
| download | frameworks_native-5e1bf8d4faabb9acd35fe969effe5ca541298737.zip frameworks_native-5e1bf8d4faabb9acd35fe969effe5ca541298737.tar.gz frameworks_native-5e1bf8d4faabb9acd35fe969effe5ca541298737.tar.bz2 | |
am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread
Merge commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661' into gingerbread-plus-aosp
* commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661':
fix [2912927] Can't get NV_draw_path extension to work
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 315a2a3..94b60a1 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -1409,7 +1409,9 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) egl_connection_t* const cnx = &gEGLImpl[i]; if (cnx->dso && cnx->egl.eglGetProcAddress) { found = true; - cnx->hooks[i]->ext.extensions[slot] = + // Extensions are independent of the bound context + cnx->hooks[GLESv1_INDEX]->ext.extensions[slot] = + cnx->hooks[GLESv2_INDEX]->ext.extensions[slot] = cnx->egl.eglGetProcAddress(procname); } } @@ -1421,7 +1423,6 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) } pthread_mutex_unlock(&gInitDriverMutex); - return addr; } |