xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-glx.c |   31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 0dc0cef4959dfb16d8334f235150733e634e2ba9
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 18 14:52:04 2019 -0400

    xwayland-glx: Fix GLX visual mask setup
    
    a2rgb10 configs would end up with channel masks corresponding to
    argb8888. This would confuse the GLX core code into matching an a2rgb10
    config to the root window visual, and that would make things look wrong
    and bad.
    
    Fix this by handling more cases. We're still not fully general here, and
    this could still be wrong on big-endian. The XXX comment about doing
    something less ugly still applies, ideally we would get this information
    out of EGL instead of making lucky guesses. Still, better than it was.
    
    Fixes: xorg/xserver#824

diff --git a/hw/xwayland/xwayland-glx.c b/hw/xwayland/xwayland-glx.c
index 71c9aad23..abf48f71c 100644
--- a/hw/xwayland/xwayland-glx.c
+++ b/hw/xwayland/xwayland-glx.c
@@ -246,14 +246,37 @@ translate_eglconfig(struct egl_screen *screen, EGLConfig hc,
      * XXX do something less ugly
      */
     if (c->base.renderType == GLX_RGBA_BIT) {
-        if (c->base.rgbBits == 24 || c->base.rgbBits == 32) {
-            c->base.redMask = 0xff0000;
-            c->base.greenMask = 0x00ff00;
-            c->base.blueMask = 0x0000ff;
+        if (c->base.redBits == 5 &&
+            (c->base.rgbBits == 15 || c->base.rgbBits == 16)) {
+            c->base.blueMask  = 0x0000001f;
+            if (c->base.alphaBits) {
+                c->base.greenMask = 0x000003e0;
+                c->base.redMask   = 0x00007c00;
+                c->base.alphaMask = 0x00008000;
+            } else {
+                c->base.greenMask = 0x000007e0;
+                c->base.redMask   = 0x0000f800;
+                c->base.alphaMask = 0x00000000;
+            }
+        }
+        else if (c->base.redBits == 8 &&
+            (c->base.rgbBits == 24 || c->base.rgbBits == 32)) {
+            c->base.blueMask  = 0x000000ff;
+            c->base.greenMask = 0x0000ff00;
+            c->base.redMask   = 0x00ff0000;
             if (c->base.alphaBits)
                 /* assume all remaining bits are alpha */
                 c->base.alphaMask = 0xff000000;
         }
+        else if (c->base.redBits == 10 &&
+            (c->base.rgbBits == 30 || c->base.rgbBits == 32)) {
+            c->base.blueMask  = 0x000003ff;
+            c->base.greenMask = 0x000ffc00;
+            c->base.redMask   = 0x3ff00000;
+            if (c->base.alphaBits)
+                /* assume all remaining bits are alpha */
+                c->base.alphaMask = 0xc000000;
+        }
     }
 
     c->base.next = chain ? &chain->base : NULL;