diff options
| -rw-r--r-- | 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 7ed401c514b..daf5ad43d74 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); |