xserver: Branch 'master'

[GitLab Mirror]

 glamor/glamor_transform.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 766bf01b21306ec6bcf5ca884c0af15bdcde25f6
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu May 16 15:48:14 2019 -0400

    glamor: Fix more fallback paths with non-GXcopy rop with GLES
    
    Desktop GL can handle arbitrary rops here, GLES can't. The switch
    statement attempts to optimize some cases that GLES can still handle if
    we precompute the right pixel value, but we were then throwing that
    pixel value away and using gc->fgPixel anyway. Fix this, and now
    xts-render passes against glamor+gles.

diff --git a/glamor/glamor_transform.c b/glamor/glamor_transform.c
index 348d00be1..11a08f7f6 100644
--- a/glamor/glamor_transform.c
+++ b/glamor/glamor_transform.c
@@ -158,7 +158,7 @@ glamor_set_solid(PixmapPtr      pixmap,
             return FALSE;
         }
     }
-    glamor_set_color(pixmap, gc->fgPixel, uniform);
+    glamor_set_color(pixmap, pixel, uniform);
 
     return TRUE;
 }