xserver: Branch 'server-1.19-branch'

[GitLab Mirror]

 exa/exa_unaccel.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit af63efe470417cde8a64068b1e6965b2677d92d9
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Dec 13 22:32:27 2018 -0600

    Add 24-bit color support to exaGetPixmapFirstPixel
    
    It appears that people who developed EXA forgot that there used to be
    graphics devices that used 24-bits (3 bytes) instead of 32-bits (4 bytes)
    in order to display one pixel. The lack of 24-bit color support inside
    exaGetPixmapFirstPixel causes SiS 6326 to crash when running Xfce since
    SiS 6326 does not support 32-bit color.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 73eada9c2..2d3e2ffe6 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -703,6 +703,7 @@ exaGetPixmapFirstPixel(PixmapPtr pPixmap)
 {
     switch (pPixmap->drawable.bitsPerPixel) {
     case 32:
+    case 24:
     {
         CARD32 pixel;