diff options
| author | Jesse Hall <jessehall@google.com> | 2013-02-01 14:26:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-01 14:26:21 -0800 |
| commit | 519191670e37bdfa7f686fb3d3ee84fafe9ad0cb (patch) | |
| tree | 6fcd2c8757b13782d21002ec3b3d51af4dba52c4 /opengl/libs | |
| parent | 0dcde5213ba6531f2895f340f523c09895275f51 (diff) | |
| parent | 873ab60e94811488caea1906eb98133329a3e28f (diff) | |
| download | frameworks_native-519191670e37bdfa7f686fb3d3ee84fafe9ad0cb.zip frameworks_native-519191670e37bdfa7f686fb3d3ee84fafe9ad0cb.tar.gz frameworks_native-519191670e37bdfa7f686fb3d3ee84fafe9ad0cb.tar.bz2 | |
am 873ab60e: am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"
# By luliuhui
# Via Android Git Automerger (1) and others
* commit '873ab60e94811488caea1906eb98133329a3e28f':
Gfx-3d: fix GetProcAddress in egl extention
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index d1f25e0..7a84651 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -761,8 +761,8 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) egl_connection_t* const cnx = &gEGLImpl; if (cnx->dso && cnx->egl.eglGetProcAddress) { - found = true; // Extensions are independent of the bound context + addr = cnx->hooks[egl_connection_t::GLESv1_INDEX]->ext.extensions[slot] = cnx->hooks[egl_connection_t::GLESv2_INDEX]->ext.extensions[slot] = #if EGL_TRACE @@ -770,10 +770,13 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) gHooksTrace.ext.extensions[slot] = #endif cnx->egl.eglGetProcAddress(procname); + if (addr) found = true; } if (found) { +#if USE_FAST_TLS_KEY addr = gExtensionForwarders[slot]; +#endif sGLExtentionMap.add(name, addr); sGLExtentionSlot++; } |