diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-10 08:23:19 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-10 08:24:27 +0100 |
| commit | 2dff681efe1b89ffe59e5d33979c6e059b72a786 (patch) | |
| tree | 65c9c59c445c81621fb0ac0b283ef52f1ac9faa3 | |
| parent | fbbd1c9dde3b2fafd8aaebb88daf3c546d86e5a4 (diff) | |
sna/blt: Remove a couple of unused members from its op-state
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_render.c | 4 | ||||
| -rw-r--r-- | src/sna/sna_render.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index 43fbff77..c89be51a 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -300,6 +300,10 @@ static struct kgem_bo *upload(struct sna *sna, DBG(("%s: origin=(%d, %d), box=(%d, %d), (%d, %d), pixmap=%dx%d\n", __FUNCTION__, x, y, box->x1, box->y1, box->x2, box->y2, pixmap->drawable.width, pixmap->drawable.height)); + assert(box->x1 >= 0); + assert(box->y1 >= 0); + assert(box->x2 <= pixmap->drawable.width); + assert(box->y2 <= pixmap->drawable.height); bo = kgem_upload_source_image(&sna->kgem, pixmap->devPrivate.ptr, diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h index bd075aa3..3d56a40a 100644 --- a/src/sna/sna_render.h +++ b/src/sna/sna_render.h @@ -82,12 +82,11 @@ struct sna_composite_op { uint32_t inplace :1; uint32_t overwrites:1; - int hdr; uint32_t cmd; uint32_t br13; uint32_t pitch[2]; uint32_t pixel; - struct kgem_bo *bo[3]; + struct kgem_bo *bo[2]; } blt; struct { |