diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-04-27 23:19:56 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-04-28 14:19:48 +0100 |
| commit | 4f1908c651ef9e2af33d8831466a605234978c46 (patch) | |
| tree | 8b890e8d5e965009ebef74db46dd6fc1fbe4203e | |
| parent | 8453034c7dd893f1d4c32ee87724f3a13137595d (diff) | |
sna: PolyPoint only uses the gc->fgPixel
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_accel.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index f4d3de4e..12017bd3 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -5560,8 +5560,7 @@ static Bool sna_poly_point_blt(DrawablePtr drawable, struct kgem_bo *bo, struct sna_damage **damage, - GCPtr gc, uint32_t pixel, - int mode, int n, DDXPointPtr pt, + GCPtr gc, int mode, int n, DDXPointPtr pt, bool clipped) { PixmapPtr pixmap = get_drawable_pixmap(drawable); @@ -5574,7 +5573,7 @@ sna_poly_point_blt(DrawablePtr drawable, DBG(("%s: alu=%d, pixel=%08lx, clipped?=%d\n", __FUNCTION__, gc->alu, gc->fgPixel, clipped)); - if (!sna_fill_init_blt(&fill, sna, pixmap, bo, gc->alu, pixel)) + if (!sna_fill_init_blt(&fill, sna, pixmap, bo, gc->alu, gc->fgPixel)) return FALSE; get_drawable_deltas(drawable, pixmap, &dx, &dy); @@ -5704,7 +5703,6 @@ sna_poly_point(DrawablePtr drawable, GCPtr gc, struct sna *sna = to_sna_from_pixmap(pixmap); RegionRec region; unsigned flags; - uint32_t color; DBG(("%s(mode=%d, n=%d, pt[0]=(%d, %d)\n", __FUNCTION__, mode, n, pt[0].x, pt[0].y)); @@ -5729,7 +5727,7 @@ sna_poly_point(DrawablePtr drawable, GCPtr gc, goto fallback; } - if (PM_IS_SOLID(drawable, gc->planemask) && gc_is_solid(gc, &color)) { + if (PM_IS_SOLID(drawable, gc->planemask)) { struct sna_damage **damage; struct kgem_bo *bo; @@ -5738,7 +5736,7 @@ sna_poly_point(DrawablePtr drawable, GCPtr gc, if ((bo = sna_drawable_use_bo(drawable, false, ®ion.extents, &damage)) && sna_poly_point_blt(drawable, bo, damage, - gc, color, mode, n, pt, flags & 2)) + gc, mode, n, pt, flags & 2)) return; } |