diff options
| author | Jesse Hall <jessehall@google.com> | 2013-02-01 12:37:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-01 12:37:25 -0800 |
| commit | 873ab60e94811488caea1906eb98133329a3e28f (patch) | |
| tree | e2f37bbea3ac2bcde50ec801ac978f07e6c12a58 /opengl/libs | |
| parent | fc866eb8423cd1d720683946f7d102547718b6c9 (diff) | |
| parent | 75b83e4dc7d8055a70e590f868f7307fdaf656a7 (diff) | |
| download | frameworks_native-873ab60e94811488caea1906eb98133329a3e28f.zip frameworks_native-873ab60e94811488caea1906eb98133329a3e28f.tar.gz frameworks_native-873ab60e94811488caea1906eb98133329a3e28f.tar.bz2 | |
am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"
# By luliuhui
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7':
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 4e44941..065faf2 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -760,8 +760,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 @@ -769,10 +769,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++; } |