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
This commit is contained in:
Jesse Hall 2013-02-01 14:26:21 -08:00 committed by Android Git Automerger
commit 519191670e
1 changed files with 4 additions and 1 deletions

View File

@ -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++;
}