diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-02 12:34:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-02 12:34:22 -0700 |
| commit | 5219a82f9d64a7d13401dcf9a0703a0ca2cd842d (patch) | |
| tree | c4928383d6e42bacd5efee051586619b6b7b80c8 | |
| parent | dfbad7d316a703f42881374b8124183d2c165bf2 (diff) | |
| parent | 8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d (diff) | |
| download | frameworks_base-5219a82f9d64a7d13401dcf9a0703a0ca2cd842d.zip frameworks_base-5219a82f9d64a7d13401dcf9a0703a0ca2cd842d.tar.gz frameworks_base-5219a82f9d64a7d13401dcf9a0703a0ca2cd842d.tar.bz2 | |
am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread
Merge commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d' into gingerbread-plus-aosp
* commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d':
Fix a bug that prevented the creation of EGL shared contexts.
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index ba09d08..714fd3e 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -1045,6 +1045,10 @@ EGLContext eglCreateContext(EGLDisplay dpy, EGLConfig config, int i=0, index=0; egl_connection_t* cnx = validate_display_config(dpy, config, dp, i, index); if (cnx) { + if (share_list != EGL_NO_CONTEXT) { + egl_context_t* const c = get_context(share_list); + share_list = c->context; + } EGLContext context = cnx->egl.eglCreateContext( dp->disp[i].dpy, dp->disp[i].config[index], share_list, attrib_list); |