From b5087ff9b1e5495c742e581f586c055de878dd4b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 8 Feb 2010 12:47:59 +0100 Subject: [PATCH] glamor: Fix the row length of 1bpp prepare_access. --- glamor/glamor_core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c index b0653d8cb..9d0e40f44 100644 --- a/glamor/glamor_core.c +++ b/glamor/glamor_core.c @@ -323,9 +323,12 @@ glamor_prepare_access(DrawablePtr drawable, glamor_access_t access) glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, pixmap_priv->fb); glPixelStorei(GL_PACK_ALIGNMENT, 1); - glPixelStorei(GL_PACK_ROW_LENGTH, read_stride * 8 / - pixmap->drawable.bitsPerPixel); - + if (drawable->depth != 1) { + glPixelStorei(GL_PACK_ROW_LENGTH, read_stride * 8 / + pixmap->drawable.bitsPerPixel); + } else { + glPixelStorei(GL_PACK_ROW_LENGTH, read_stride); + } if (GLEW_MESA_pack_invert && drawable->depth != 1) { glPixelStorei(GL_PACK_INVERT_MESA, 1); glReadPixels(0, 0,