Mesa (master): egl/drm: do not crash when swapping buffers without any rendering

[Kristian Høgsberg]

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

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Tue Oct 14 10:39:47 2014 +0100

egl/drm: do not crash when swapping buffers without any rendering

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>

---

 src/egl/drivers/dri2/platform_drm.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c
index ab71f4b..753c60f 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -418,6 +418,14 @@ dri2_drm_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw)
          for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++)
             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) {
+            _eglError(EGL_BAD_ALLOC, "dri2_swap_buffers");
+            return EGL_FALSE;
+         }
+
          dri2_surf->current = dri2_surf->back;
          dri2_surf->current->age = 1;
          dri2_surf->back = NULL;