Module: Mesa
Branch: master
Commit: c132c2978b02da7140462a633605a0127dfcceb4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c132c2978b02da7140462a633605a0127dfcceb4
Author: Richard Sandiford <r.sandif...@uk.ibm.com>
Date: Mon Jun 17 12:13:25 2013 -0400
st/xlib: Fix XImage stride calculation
Fixes window skew 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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c
b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 7ed401c..daf5ad4 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -1381,7 +1381,7 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int
buffer,
enum pipe_format internal_format = res->format;
struct pipe_transfer *tex_xfer;
char *map;
- int line, ximage_stride;
+ int line, byte_width;
XImage *img;
internal_format = choose_pixel_format(drawable->xm_visual);
@@ -1408,12 +1408,12 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable,
int buffer,
}
/* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
- ximage_stride = w * ((img->bits_per_pixel + 7) / 8);
+ byte_width = w * ((img->bits_per_pixel + 7) / 8);
for (line = 0; line < h; line++)
memcpy(&map[line * tex_xfer->stride],
- &img->data[line * ximage_stride],
- ximage_stride);
+ &img->data[line * img->bytes_per_line],
+ byte_width);
pipe_transfer_unmap(pipe, tex_xfer);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
