xserver: Branch 'master'

[Keith Packard]

 glx/glxdriswrast.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1cc0d3df1fdb6c4393ac455ca038e1e0680bb22
Author: Maks Naumov <maksqwe1 at ukr.net>
Date:   Thu Aug 21 12:58:16 2014 -0700

    glx: Fix 'y ' value in swrastGetDrawableInfo()
    
    Signed-off-by: Maks Naumov <maksqwe1 at ukr.net>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index c30ce9a..5d9aa04 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -325,7 +325,7 @@ swrastGetDrawableInfo(__DRIdrawable * draw,
     DrawablePtr pDraw = drawable->base.pDraw;
 
     *x = pDraw->x;
-    *y = pDraw->x;
+    *y = pDraw->y;
     *w = pDraw->width;
     *h = pDraw->height;
 }