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
This commit is contained in:
Jesse Hall 2013-02-01 12:37:25 -08:00 committed by Android Git Automerger
commit 873ab60e94

View File

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