diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 13:22:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 13:22:55 -0700 |
| commit | defcf8020df99c526278146ef560883d3d7f1afd (patch) | |
| tree | ccb3e6095b33984001642bf0cad79f8e899f06c5 /opengl | |
| parent | 1bc9e127d90a92283da8f1b47c831ea2f8da85ad (diff) | |
| parent | f51f9c8af3a9974fa71be73a905aec70672aa0cb (diff) | |
| download | frameworks_native-defcf8020df99c526278146ef560883d3d7f1afd.zip frameworks_native-defcf8020df99c526278146ef560883d3d7f1afd.tar.gz frameworks_native-defcf8020df99c526278146ef560883d3d7f1afd.tar.bz2 | |
Merge change 5352 into donut
* changes:
fix [1942438] eglGetCurrentSurface() returns bogus value
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 25e31ee..de323b3 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -1052,23 +1052,25 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw, if (!validate_display_context(dpy, ctx)) return EGL_FALSE; + EGLSurface impl_draw = EGL_NO_SURFACE; + EGLSurface impl_read = EGL_NO_SURFACE; egl_context_t * const c = get_context(ctx); if (draw != EGL_NO_SURFACE) { egl_surface_t const * d = get_surface(draw); if (!d) return setError(EGL_BAD_SURFACE, EGL_FALSE); if (d->impl != c->impl) return setError(EGL_BAD_MATCH, EGL_FALSE); - draw = d->surface; + impl_draw = d->surface; } if (read != EGL_NO_SURFACE) { egl_surface_t const * r = get_surface(read); if (!r) return setError(EGL_BAD_SURFACE, EGL_FALSE); if (r->impl != c->impl) return setError(EGL_BAD_MATCH, EGL_FALSE); - read = r->surface; + impl_read = r->surface; } EGLBoolean result = c->cnx->hooks->egl.eglMakeCurrent( - dp->dpys[c->impl], draw, read, c->context); + dp->dpys[c->impl], impl_draw, impl_read, c->context); if (result == EGL_TRUE) { setGlThreadSpecific(c->cnx->hooks); |