diff options
| author | Jesse Hall <jessehall@google.com> | 2013-02-01 19:33:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-01 19:33:16 +0000 |
| commit | 75b83e4dc7d8055a70e590f868f7307fdaf656a7 (patch) | |
| tree | 7a7a7d35d5cb4317bf96faa2ddf801c90a3e9994 | |
| parent | 845ed8fdaa34d0f684c93bf4dbadb9162f769235 (diff) | |
| parent | 69d100762c7c26d8328f4bb61cfef026d3a69bbf (diff) | |
| download | native-jb-mr1-dev-plus-aosp.tar.gz | |
Merge "Gfx-3d: fix GetProcAddress in egl extention"jb-mr1-dev-plus-aosp
| -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 4e4494142b..065faf24ba 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++; } |