From: Emil Velikov <emil.velikov@collabora.com>
Date: Fri, 12 May 2017 13:22:51 +0000 (+0100)
Subject: egl/wayland: set the resize_callback if the flush extension is available
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=429d56693d9eadf64fca20c9bf9f9415e68efd80;p=mesa.git

egl/wayland: set the resize_callback if the flush extension is available

Strictly speaking __DRI_DRI2 implies __DRI2_FLUSH. Although since we're
using the latter in the callback, we want to use the correct guard.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index eafb9d5673f..39c36075d09 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -188,13 +188,13 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
    config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
                                 dri2_surf->base.GLColorspace);
 
-   if (dri2_dpy->dri2) {
+   if (dri2_dpy->flush)
       dri2_surf->wl_win->resize_callback = resize_callback;
 
+   if (dri2_dpy->dri2)
       createNewDrawable = dri2_dpy->dri2->createNewDrawable;
-   } else {
+   else
       createNewDrawable = dri2_dpy->swrast->createNewDrawable;
-   }
 
    dri2_surf->dri_drawable = (*createNewDrawable)(dri2_dpy->dri_screen, config,
                                                   dri2_surf);