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

[Chris Wilson]

 src/sna/sna_damage.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit f8c91f229a9ca18fc58b0cabbea595d26627db8b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Dec 24 12:17:53 2011 +0000

    sna: We can always compare the box to be subtracted against the dirty extents
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c
index 8b5ca7b..cc4bf6a 100644
--- a/src/sna/sna_damage.c
+++ b/src/sna/sna_damage.c
@@ -962,13 +962,13 @@ static struct sna_damage *__sna_damage_subtract(struct sna_damage *damage,
 	if (!sna_damage_maybe_contains_box(damage, &region->extents))
 		return damage;
 
-	if (damage->mode != DAMAGE_SUBTRACT) {
-		if (region_is_singular(region) &&
-		    box_contains(&region->extents, &damage->extents)) {
-			__sna_damage_destroy(damage);
-			return NULL;
-		}
+	if (region_is_singular(region) &&
+	    box_contains(&region->extents, &damage->extents)) {
+		__sna_damage_destroy(damage);
+		return NULL;
+	}
 
+	if (damage->mode != DAMAGE_SUBTRACT) {
 		if (damage->dirty)
 			__sna_damage_reduce(damage);
 
@@ -1041,12 +1041,12 @@ inline static struct sna_damage *__sna_damage_subtract_box(struct sna_damage *da
 	if (!sna_damage_maybe_contains_box(damage, box))
 		return damage;
 
-	if (damage->mode != DAMAGE_SUBTRACT) {
-		if (box_contains(box, &damage->extents)) {
-			__sna_damage_destroy(damage);
-			return NULL;
-		}
+	if (box_contains(box, &damage->extents)) {
+		__sna_damage_destroy(damage);
+		return NULL;
+	}
 
+	if (damage->mode != DAMAGE_SUBTRACT) {
 		if (damage->dirty)
 			__sna_damage_reduce(damage);