xf86-video-intel: src/sna/sna_composite.c

Chris Wilson ickle at kemper.freedesktop.org
Tue Aug 13 03:02:34 PDT 2013


 src/sna/sna_composite.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 504b18b079e0a12a9d18b46418411805ef1d8377
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Aug 13 11:01:03 2013 +0100

    sna: Fix the assertions for the composite fb path
    
    Having updated the offsets for the dst, we also need to update the
    assertions.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 79fee4f..085a627 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -563,10 +563,10 @@ sna_composite_fb(CARD8 op,
 				assert(box->y1 + sy >= 0);
 				assert(box->y2 + sy <= src_pixmap->drawable.height);
 
-				assert(box->x1 + dst_x >= 0);
-				assert(box->x2 + dst_x <= dst_pixmap->drawable.width);
-				assert(box->y1 + dst_y >= 0);
-				assert(box->y2 + dst_y <= dst_pixmap->drawable.height);
+				assert(box->x1 + tx >= 0);
+				assert(box->x2 + tx <= dst_pixmap->drawable.width);
+				assert(box->y1 + ty >= 0);
+				assert(box->y2 + ty <= dst_pixmap->drawable.height);
 
 				assert(box->x2 > box->x1 && box->y2 > box->y1);
 


More information about the xorg-commit mailing list