diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2017-06-06 18:42:06 +0900 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-09-25 15:34:10 -0400 |
| commit | 3a53e4407fb9e0c0e0dbf8d147b67f6e36aea5ae (patch) | |
| tree | 576e275e77d78acf6c76cfe47df13c2d81e29fee | |
| parent | 87a7393799ab5d1ea4a19ae7687cd50ac0dceeb4 (diff) | |
glamor: Fix temporary pixmap coordinate offsets
The previous values happened to work in basic cases, but not in general
if the destination is a subwindow or has a border.
Fixes crash with xli, which moves a large subwindow inside a smaller
parent window for scrolling.
No regressions with xterm, x11perf -copyplane or the xscreensaver
phosphor hack.
Bug: https://bugs.debian.org/857983
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit ffda82ed04d28feae2e001dbd0c32d6c795d90b1)
| -rw-r--r-- | glamor/glamor_copy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c index ff8f44ef1..ed96b2b1e 100644 --- a/glamor/glamor_copy.c +++ b/glamor/glamor_copy.c @@ -230,8 +230,8 @@ glamor_copy_cpu_fbo(DrawablePtr src, goto bail; } - src_pix->drawable.x = -dst->x; - src_pix->drawable.y = -dst->y; + src_pix->drawable.x = dst_xoff; + src_pix->drawable.y = dst_yoff; fbGetDrawable(&src_pix->drawable, src_bits, src_stride, src_bpp, src_xoff, src_yoff); |