xserver: Branch 'master'

[Eric Anholt]

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

New commits:
commit fe0b297420fc1de8a7fab28457d0864b3182e967
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Mar 15 17:51:46 2017 -0700

    glamor: Fix dashed line rendering.
    
    We were binding the screen pixmap as the dash and sampling its alpha,
    which is usually just 1.0 (no dashing at all).
    
    Please cherry-pick this to active stable branches.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/glamor/glamor_dash.c b/glamor/glamor_dash.c
index 78a4fa37a..b53ce5c50 100644
--- a/glamor/glamor_dash.c
+++ b/glamor/glamor_dash.c
@@ -147,7 +147,7 @@ glamor_dash_setup(DrawablePtr drawable, GCPtr gc)
         goto bail;
 
     dash_pixmap = glamor_get_dash_pixmap(gc);
-    dash_priv = glamor_get_pixmap_private(pixmap);
+    dash_priv = glamor_get_pixmap_private(dash_pixmap);
 
     if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(dash_priv))
         goto bail;