diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-05-10 12:10:09 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-05-17 20:16:47 +0100 |
| commit | 6061812a6420b2196f9fe9557b70f5706a20613f (patch) | |
| tree | 5aff11708fb37419c72034ce7012c52ff4a97017 /src/i915_render.c | |
| parent | 57c802aa91ee788cef8159d3de000c535552ffab (diff) | |
uxa,i915: Handle SourcePict through uxa_composite()
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 0d4dd00aeafdd625ffe902e26e666b63a0842adc)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'src/i915_render.c')
| -rw-r--r-- | src/i915_render.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i915_render.c b/src/i915_render.c index 25ad51ce..98f8f4a8 100644 --- a/src/i915_render.c +++ b/src/i915_render.c @@ -369,13 +369,13 @@ i915_prepare_composite(int op, PicturePtr source_picture, PicturePtr mask_picture, PicturePtr dest_picture, PixmapPtr source, PixmapPtr mask, PixmapPtr dest) { - ScrnInfoPtr scrn = xf86Screens[source_picture->pDrawable->pScreen->myNum]; + ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum]; intel_screen_private *intel = intel_get_screen_private(scrn); drm_intel_bo *bo_table[] = { NULL, /* batch_bo */ - i830_get_pixmap_bo(source), - mask ? i830_get_pixmap_bo(mask) : NULL, i830_get_pixmap_bo(dest), + source ? i830_get_pixmap_bo(source) : NULL, + mask ? i830_get_pixmap_bo(mask) : NULL, }; int tex_unit = 0; @@ -465,7 +465,7 @@ i915_prepare_composite(int op, PicturePtr source_picture, intel->i915_render_state.op = op; - if(i830_uxa_pixmap_is_dirty(source) || + if((source && i830_uxa_pixmap_is_dirty(source)) || (mask && i830_uxa_pixmap_is_dirty(mask))) intel_batch_emit_flush(scrn); |