xf86-video-intel: 2 commits - src/i915_render.c uxa/uxa-render.c

[Chris Wilson]

 src/i915_render.c |    2 +-
 uxa/uxa-render.c  |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 3eded4202ea00d42edf5edad831484ebc6c0c826
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon May 10 23:38:17 2010 +0100

    i915: Fix pixmap based masks.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i915_render.c b/src/i915_render.c
index 98f8f4a..6ce7256 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -397,7 +397,7 @@ i915_prepare_composite(int op, PicturePtr source_picture,
 	if (!intel->render_source_is_solid && !intel_check_pitch_3d(source))
 		return FALSE;
 
-	intel->render_mask_is_solid = TRUE; /* mask == NULL => opaque */
+	intel->render_mask_is_solid = FALSE;
 	if (mask) {
 		if (mask_picture->pSourcePict) {
 			SourcePict *source = mask_picture->pSourcePict;
commit 1ecd89be039b642affb2f9933f4341d186cb4dea
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon May 10 23:33:52 2010 +0100

    uxa: Protect against valid SourcePict in uxa_acquire_mask()
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 849a646..e0581b0 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -740,8 +740,13 @@ uxa_acquire_mask(ScreenPtr pScreen,
 
 	if (uxa_screen->info->check_composite_texture &&
 	    uxa_screen->info->check_composite_texture(pScreen, pPict)) {
-		*out_x = x + pPict->pDrawable->x;
-		*out_y = y + pPict->pDrawable->y;
+		if (pPict->pDrawable) {
+			*out_x = x + pPict->pDrawable->x;
+			*out_y = y + pPict->pDrawable->y;
+		} else {
+			*out_x = x;
+			*out_y = y;
+		}
 		return pPict;
 	}