From c3c3a6349766b4fdee080ff203fb548725e42e50 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 8 Feb 2010 15:34:45 +0100
Subject: [PATCH] glamor: Use the pixmap stride in fallbacks instead of trying
 to guess it.

Mostly fixes gnome-terminal text.
---
 glamor/glamor_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index f35baafa0..4d03bd718 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -293,7 +293,7 @@ glamor_prepare_access(DrawablePtr drawable, glamor_access_t access)
 	    return TRUE;
     }
 
-    stride = PixmapBytePad(pixmap->drawable.width, drawable->depth);
+    stride = pixmap->devKind;
     read_stride = stride;
 
     data = xalloc(stride * pixmap->drawable.height);
@@ -476,7 +476,7 @@ glamor_finish_access(DrawablePtr drawable)
 	return;
     }
 
-    stride = PixmapBytePad(pixmap->drawable.width, drawable->depth);
+    stride = pixmap->devKind;
 
     glVertexPointer(2, GL_FLOAT, sizeof(float) * 2, vertices);
     glEnableClientState(GL_VERTEX_ARRAY);