xserver: Branch 'master'

[GitLab Mirror]

 glamor/glamor_egl.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 382c26dade81a4c629307a3bfe6f5cca5af640e0
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Oct 5 12:24:23 2018 +0200

    glamor: Add support for exporting depth 15/8 pixmaps
    
    This allows X to run with glamor at these depths.

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 210c11824..ca7ea8c98 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -291,6 +291,12 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
     case 16:
         format = GBM_FORMAT_RGB565;
         break;
+    case 15:
+        format = GBM_FORMAT_ARGB1555;
+        break;
+    case 8:
+        format = GBM_FORMAT_R8;
+        break;
     default:
         xf86DrvMsg(scrn->scrnIndex, X_ERROR,
                    "Failed to make %d depth, %dbpp pixmap exportable\n",