diff options
| author | Mathias Agopian <mathias@google.com> | 2009-06-24 23:59:16 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-06-24 23:59:16 -0700 |
| commit | a1254616d62d470b129a501193f15d50045cd3ae (patch) | |
| tree | 8c066ce7401cac9a7e35cc89e064fca9b73b2568 /opengl | |
| parent | 5277103db9033226814edc8fcba6f4ba4e846678 (diff) | |
| download | frameworks_base-a1254616d62d470b129a501193f15d50045cd3ae.zip frameworks_base-a1254616d62d470b129a501193f15d50045cd3ae.tar.gz frameworks_base-a1254616d62d470b129a501193f15d50045cd3ae.tar.bz2 | |
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); |