summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-07-30 11:42:09 -0700
committerAndroid Code Review <code-review@android.com>2010-07-30 11:42:09 -0700
commit0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916 (patch)
tree51b0639c29a1c5abc441e2aa31aff7983892b641
parenta27353c1965911f69be8d02a01b15389189eab9d (diff)
parentd0062478efa08bfebfc331f8999bf188a8f2d1bc (diff)
downloadframeworks_base-0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916.zip
frameworks_base-0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916.tar.gz
frameworks_base-0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916.tar.bz2
Merge "Fix a bug that prevented the creation of EGL shared contexts."
-rw-r--r--opengl/libs/EGL/egl.cpp4
1 files changed, 4 insertions, 0 deletions
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 @@ 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);