commit 3af76d897849e4e73f967647b0e3c11cf88e9ca5
author Jean-Baptiste Queru <jbq@google.com> Fri Jul 30 11:42:09 2010 -0700
committer Android Code Review <code-review@android.com> Fri Jul 30 11:42:09 2010 -0700
tree dd6f8c827df736f8988257edbeb5a02fd7e997ba
parent 9741fdbd05e4403bcfc24097933710e7f81b1c85
parent 51f65a34e12ec6f1aa737d45e260bb0c7a02b49b

Merge "Fix a bug that prevented the creation of EGL shared contexts."

opengl/libs/EGL/egl.cpp

diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index 89b3e1f..40317e7 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -1043,6 +1043,10 @@
     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);