diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-02 12:32:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-02 12:32:33 -0700 |
| commit | bf83375c73f0dcde5d97b36273e3fd971411e866 (patch) | |
| tree | ba2edb4d1b6173e1344d6112045d43916e205176 /opengl | |
| parent | 1b0d2023c372bf3e918cfdf22d181099f7140d96 (diff) | |
| parent | 4c39f8f9e2df75a5b53b3ccae712a8946195a8a3 (diff) | |
| download | frameworks_native-bf83375c73f0dcde5d97b36273e3fd971411e866.zip frameworks_native-bf83375c73f0dcde5d97b36273e3fd971411e866.tar.gz frameworks_native-bf83375c73f0dcde5d97b36273e3fd971411e866.tar.bz2 | |
Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread
Diffstat (limited to 'opengl')
| -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); |