commit d175e7c16b4de1a4231b806dad3e400be9611121
author Lionel Landwerlin <lionel.g.landwerlin@intel.com> Tue Oct 14 10:39:47 2014 +0100
committer Kristian Høgsberg <krh@bitplanet.net> Mon Oct 27 10:36:21 2014 -0700
tree 5a93f8ca1730b614c8b692c7b6cc0151bbef7f17
parent 1a170980a09d82201b88e3fe20684a0df2cfea80

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

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

src/egl/drivers/dri2/platform_drm.c

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 @@
          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;