xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-glamor.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit cdec2b3c195d1d080207ef01c55ff14b45370010
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Jul 25 16:33:23 2018 +0200

    xwayland: Enable DRI3 for glamor
    
    glamor_fds_from_pixmap() will bail out early if DRI3 is not enabled,
    unfortunately Xwayland's glamor code would not set it as enabled which
    would lead to blank pixmaps when using texture from pixmap.
    
    Make sure to mark DRI3 as enabled from glamor_egl_screen_init() in
    Xwayland.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107287
    Fixes: c8c276c956 ("glamor: Implement PixmapFromBuffers and BuffersFromPixmap")
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index f17914344..7ea6def61 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -57,6 +57,7 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
 {
     struct xwl_screen *xwl_screen = xwl_screen_get(screen);
 
+    glamor_enable_dri3(screen);
     glamor_ctx->ctx = xwl_screen->egl_context;
     glamor_ctx->display = xwl_screen->egl_display;