[Mesa-stable] [PATCH v2] egl_dri2: set correct error code if swapbuffers fails
Tapani Pälli
tapani.palli at intel.com
Mon Feb 15 07:31:09 UTC 2016
From: Daniel Czarnowski <daniel.czarnowski at intel.com>
A return value of '-1' means that there was error during swap with a
window drawable, in this case we set error as EGL_BAD_NATIVE_WINDOW.
v2: coding style cleanup, better commit message
Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
Cc: "11.0 11.1" <mesa-stable at lists.freedesktop.org
---
src/egl/drivers/dri2/platform_x11.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 931ee51..420f567 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -872,7 +872,12 @@ dri2_x11_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw)
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
if (dri2_dpy->dri2) {
- return dri2_x11_swap_buffers_msc(drv, disp, draw, 0, 0, 0) != -1;
+ if (dri2_x11_swap_buffers_msc(drv, disp, draw, 0, 0, 0) != -1) {
+ return EGL_TRUE;
+ }
+ /* Swap failed with a window drawable. */
+ _eglError(EGL_BAD_NATIVE_WINDOW, __FUNCTION__);
+ return EGL_FALSE;
} else {
assert(dri2_dpy->swrast);
--
2.5.0
More information about the mesa-stable
mailing list