Module: Mesa
Branch: master
Commit: 876fefe2ff8901ae4b908cff89ac5dd4324f4fe5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=876fefe2ff8901ae4b908cff89ac5dd4324f4fe5
Author: Richard Sandiford <r.sandif...@uk.ibm.com>
Date: Mon Jun 17 12:10:49 2013 -0400
st/xlib Fix XIMage bytes-per-pixel calculation
Fixes a crash seen while running gnome on a 16-bit screen over vnc.
NOTE: This is a candidate for stable release branches.
Reviewed-by: Brian Paul <bri...@vmware.com>
Signed-off-by: Richard Sandiford <rsand...@linux.vnet.ibm.com>
---
src/gallium/state_trackers/glx/xlib/xm_api.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c
b/src/gallium/state_trackers/glx/xlib/xm_api.c
index b758c8e..7ed401c 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -1407,9 +1407,8 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int
buffer,
return;
}
- /* The pipe transfer has a pitch rounded up to the nearest 64 pixels.
- We assume 32 bit pixels. */
- ximage_stride = w * 4;
+ /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
+ ximage_stride = w * ((img->bits_per_pixel + 7) / 8);
for (line = 0; line < h; line++)
memcpy(&map[line * tex_xfer->stride],
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
