From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 31 Mar 2000 05:49:08 +0000 (+0000)
Subject: fixed Voodoo1/2/ stride problem in fxDDReadPixels()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7909019a3eb4a597c6d064d6e0e4ef88515e6ea7;p=mesa.git

fixed Voodoo1/2/ stride problem in fxDDReadPixels()
---

diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index bd571d415c3..01e70951418 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -543,8 +543,12 @@ static GLboolean fxDDReadPixels( GLcontext *ctx, GLint x, GLint y,
                   &info)) {
       const GLint winX = fxMesa->x_offset;
       const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+#ifdef XF86DRI
       const GLint srcStride = (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
-                            ? (fxMesa->screen_width) : (info.strideInBytes / 2);
+                          ? (fxMesa->screen_width) : (info.strideInBytes / 2);
+#else
+      const GLint srcStride = info.strideInBytes / 2; /* stride in GLushorts */
+#endif
       const GLushort *src = (const GLushort *) info.lfbPtr
                           + (winY - y) * srcStride + (winX + x);
       GLubyte *dst = (GLubyte *) _mesa_image_address(packing, dstImage,