xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-glx.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fc4f248544f207ffd68303da22ea1e27beb3729f
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Jun 5 14:33:03 2020 -0400

    xwayland: Set the vendor name for GLX_EXT_libglvnd
    
    Without this the client library will flail around looking for a default
    provider, probably one named "indirect", and that defeats the point of
    having the EGL provider for direct context support in the first place.
    
    This assumes that "mesa" will work, of course, and in general it should.
    Mesa drivers will DTRT through the DRI3 setup path, and if our glamor is
    atop something non-Mesa then you should fall back to llvmpipe like 1.20.
    In the future it might be useful to differentiate the vendor here based
    on whether glamor is using gbm or streams.
    
    Fixes: xorg/xserver#1032

diff --git a/hw/xwayland/xwayland-glx.c b/hw/xwayland/xwayland-glx.c
index 4fd3e6905..7e2a87fc1 100644
--- a/hw/xwayland/xwayland-glx.c
+++ b/hw/xwayland/xwayland-glx.c
@@ -378,6 +378,9 @@ egl_screen_probe(ScreenPtr pScreen)
         return NULL;
     }
 
+    if (!screen->base.glvnd)
+        screen->base.glvnd = strdup("mesa");
+
     __glXScreenInit(base, pScreen);
     __glXsetGetProcAddress(eglGetProcAddress);