diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-16 07:49:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-16 07:49:24 -0700 |
| commit | d601649e6a910fcd839a247bc32c9bc4291b492f (patch) | |
| tree | 94f17aac8b0abd4acb458614f336351a99b52208 /opengl | |
| parent | 79b2cf3c65f1a74b0448f0cfb047395b1bcc2225 (diff) | |
| parent | a4ed1c6788ead0324106d76f497233ee42a1f1ac (diff) | |
| download | frameworks_base-d601649e6a910fcd839a247bc32c9bc4291b492f.zip frameworks_base-d601649e6a910fcd839a247bc32c9bc4291b492f.tar.gz frameworks_base-d601649e6a910fcd839a247bc32c9bc4291b492f.tar.bz2 | |
am a4ed1c67: am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread
Merge commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac'
* commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac':
fix [2912927] Can't get NV_draw_path extension to work
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 315a2a3..94b60a1 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -1409,7 +1409,9 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) egl_connection_t* const cnx = &gEGLImpl[i]; if (cnx->dso && cnx->egl.eglGetProcAddress) { found = true; - cnx->hooks[i]->ext.extensions[slot] = + // Extensions are independent of the bound context + cnx->hooks[GLESv1_INDEX]->ext.extensions[slot] = + cnx->hooks[GLESv2_INDEX]->ext.extensions[slot] = cnx->egl.eglGetProcAddress(procname); } } @@ -1421,7 +1423,6 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) } pthread_mutex_unlock(&gInitDriverMutex); - return addr; } |