Mesa (master): Revert "android: fix segfault within swap_buffers"

Tapani Pälli tpalli at kemper.freedesktop.org
Fri Apr 21 07:04:40 UTC 2017


Module: Mesa
Branch: master
Commit: ae6cbdede080b82866cc1a486525d6f0e2df59b8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae6cbdede080b82866cc1a486525d6f0e2df59b8

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Fri Apr 21 10:00:21 2017 +0300

Revert "android: fix segfault within swap_buffers"

This reverts commit 4d4558411db166d2d66f8cec9cb581149dbe1597.

This was a wrong call, while it fixed issue with 3DMark it
actually introduced regression elsewhere.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/egl/drivers/dri2/platform_android.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 6cbe119b02..35f2e5dbe6 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -619,14 +619,6 @@ droid_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw)
       if (dri2_surf->color_buffers[i].age > 0)
          dri2_surf->color_buffers[i].age++;
    }
-
-   /* Make sure we have a back buffer in case we're swapping without
-    * ever rendering. */
-   if (get_back_bo(dri2_surf, 0) < 0) {
-      _eglError(EGL_BAD_ALLOC, "dri2_swap_buffers");
-      return EGL_FALSE;
-   }
-
    dri2_surf->back->age = 1;
 
    dri2_flush_drawable_for_swapbuffers(disp, draw);




More information about the mesa-commit mailing list