[Spice-devel] [PATCH xf86-qxl 04/27] qxl: remove qxl_screen_t->stride

[Marc-André Lureau]

From: Alon Levy <alevy at redhat.com>

---
 src/qxl.h         |    1 -
 src/qxl_driver.c  |    1 -
 src/qxl_surface.c |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/qxl.h b/src/qxl.h
index 1db0581..c2d2369 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -158,7 +158,6 @@ struct _qxl_screen_t
     int				virtual_x;
     int				virtual_y;
     void *			fb;
-    int				stride;
     struct QXLMode *		current_mode;
     qxl_surface_t *		primary;
     
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 0df6883..90619e6 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -1125,7 +1125,6 @@ qxl_screen_init(SCREEN_INIT_ARGS_DECL)
     
     qxl->virtual_x = pScrn->virtualX;
     qxl->virtual_y = pScrn->virtualY;
-    qxl->stride = pScrn->virtualX * 4;
     
     pScrn->displayWidth = pScrn->virtualX;
     
diff --git a/src/qxl_surface.c b/src/qxl_surface.c
index 113f09b..e58a0d4 100644
--- a/src/qxl_surface.c
+++ b/src/qxl_surface.c
@@ -389,7 +389,7 @@ qxl_surface_cache_create_primary (surface_cache_t	*cache,
 
     host_image = pixman_image_create_bits (format, 
 					   qxl->virtual_x, qxl->virtual_y,
-					   qxl->fb, qxl->stride);
+					   qxl->fb, mode->stride);
 
     surface = malloc (sizeof *surface);
     surface->id = 0;
-- 
1.7.10.4