[Mesa-dev] [PATCH 3/3] egl/wayland: use the image_driver alongside the image_loader

[Emil Velikov]

On 11 May 2017 at 23:22, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> Analogous to previous commit.
>
> Cc: Derek Foreman <derekf at osg.samsung.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> Derek, afaict we should be able to revert commit 534ea2b5ba0 with this
> in place.
>
> Can you please apply this patch, revert 534ea2b5ba0 and give it a test?
> If things are still broken, please send me a backtrace while breaking
> in image_get_buffers().
>
The following hunk should be squashed with this patch


--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -148,7 +148,7 @@ dri2_wl_create_window_surface(_EGLDriver *drv,
_EGLDisplay *disp,
   if (!_eglInitSurface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf,
attrib_list))
      goto cleanup_surf;

-   if (dri2_dpy->dri2) {
+   if (dri2_dpy->image_driver || dri2_dpy->dri2) {
      if (conf->RedSize == 5)
         dri2_surf->format = WL_DRM_FORMAT_RGB565;
      else if (conf->AlphaSize == 0)

-Emil