Mesa (master): egl/android: Mark surface as lost when dequeueBuffer fails
Chad Versace
chadversary at kemper.freedesktop.org
Fri May 5 00:47:02 UTC 2017
Module: Mesa
Branch: master
Commit: e5eace586848511f4ceaffaa2d45131c31c45ae0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5eace586848511f4ceaffaa2d45131c31c45ae0
Author: Chad Versace <chadversary at chromium.org>
Date: Thu May 4 17:46:34 2017 -0700
egl/android: Mark surface as lost when dequeueBuffer fails
This ensures that future calls to eglSwapBuffers and eglMakeCurrent emit
an error.
This patch is part of a series for fixing
android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface
on Chrome OS x86 devices.
Cc: mesa-stable at lists.freedesktop.org
Cc: Tomasz Figa <tfiga at chromium.org>
Cc: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Nicolas Boichat <drinkcat at chromium.org>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
src/egl/drivers/dri2/platform_android.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index f45fcdf4ff..2450d9de47 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -431,12 +431,16 @@ droid_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
static int
update_buffers(struct dri2_egl_surface *dri2_surf)
{
+ if (dri2_surf->base.Lost)
+ return -1;
+
if (dri2_surf->base.Type != EGL_WINDOW_BIT)
return 0;
/* try to dequeue the next back buffer */
if (!dri2_surf->buffer && !droid_window_dequeue_buffer(dri2_surf)) {
_eglLog(_EGL_WARNING, "Could not dequeue buffer from native window");
+ dri2_surf->base.Lost = true;
return -1;
}
@@ -628,6 +632,12 @@ droid_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw)
dri2_flush_drawable_for_swapbuffers(disp, draw);
+ /* dri2_surf->buffer can be null even when no error has occured. For
+ * example, if the user has called no GL rendering commands since the
+ * previous eglSwapBuffers, then the driver may have not triggered
+ * a callback to ANativeWindow::dequeueBuffer, in which case
+ * dri2_surf->buffer remains null.
+ */
if (dri2_surf->buffer)
droid_window_enqueue_buffer(disp, dri2_surf);
More information about the mesa-commit
mailing list