sna/gen4+: Use the drawable rectangle offset for copy boxes

Saves a little bit of work whilst emitting the rectangles.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-06-25 16:32:30 +01:00
parent 3833ff9677
commit 2c73b4651a
3 changed files with 13 additions and 7 deletions

View File

@ -2194,6 +2194,8 @@ gen4_render_copy_boxes(struct sna *sna, uint8_t alu,
tmp.dst.height = dst->drawable.height;
tmp.dst.format = sna_format_for_depth(dst->drawable.depth);
tmp.dst.bo = dst_bo;
tmp.dst.x = dst_dx;
tmp.dst.y = dst_dy;
tmp.src.bo = src_bo;
tmp.src.filter = SAMPLER_FILTER_NEAREST;
@ -2225,7 +2227,7 @@ gen4_render_copy_boxes(struct sna *sna, uint8_t alu,
gen4_render_copy_one(sna, &tmp,
box->x1 + src_dx, box->y1 + src_dy,
box->x2 - box->x1, box->y2 - box->y1,
box->x1 + dst_dx, box->y1 + dst_dy);
box->x1, box->y1);
box++;
} while (--n);

View File

@ -2132,6 +2132,8 @@ gen5_render_copy_boxes(struct sna *sna, uint8_t alu,
tmp.dst.height = dst->drawable.height;
tmp.dst.format = sna_format_for_depth(dst->drawable.depth);
tmp.dst.bo = dst_bo;
tmp.dst.x = dst_dx;
tmp.dst.y = dst_dy;
tmp.src.bo = src_bo;
tmp.src.filter = SAMPLER_FILTER_NEAREST;
@ -2173,15 +2175,15 @@ gen5_render_copy_boxes(struct sna *sna, uint8_t alu,
box->x1 + src_dx, box->y1 + src_dy,
box->x1 + dst_dx, box->y1 + dst_dy,
box->x2 - box->x1, box->y2 - box->y1));
OUT_VERTEX(box->x2 + dst_dx, box->y2 + dst_dy);
OUT_VERTEX(box->x2, box->y2);
OUT_VERTEX_F((box->x2 + src_dx) * tmp.src.scale[0]);
OUT_VERTEX_F((box->y2 + src_dy) * tmp.src.scale[1]);
OUT_VERTEX(box->x1 + dst_dx, box->y2 + dst_dy);
OUT_VERTEX(box->x1, box->y2);
OUT_VERTEX_F((box->x1 + src_dx) * tmp.src.scale[0]);
OUT_VERTEX_F((box->y2 + src_dy) * tmp.src.scale[1]);
OUT_VERTEX(box->x1 + dst_dx, box->y1 + dst_dy);
OUT_VERTEX(box->x1, box->y1);
OUT_VERTEX_F((box->x1 + src_dx) * tmp.src.scale[0]);
OUT_VERTEX_F((box->y1 + src_dy) * tmp.src.scale[1]);

View File

@ -2332,6 +2332,8 @@ gen6_render_copy_boxes(struct sna *sna, uint8_t alu,
tmp.dst.height = dst->drawable.height;
tmp.dst.format = sna_format_for_depth(dst->drawable.depth);
tmp.dst.bo = dst_bo;
tmp.dst.x = dst_dx;
tmp.dst.y = dst_dy;
tmp.src.bo = src_bo;
tmp.src.filter = SAMPLER_FILTER_NEAREST;
@ -2385,9 +2387,9 @@ gen6_render_copy_boxes(struct sna *sna, uint8_t alu,
box->x1 + src_dx, box->y1 + src_dy,
box->x1 + dst_dx, box->y1 + dst_dy,
box->x2 - box->x1, box->y2 - box->y1));
v[0] = pack_2s(box->x2 + dst_dx, box->y2 + dst_dy);
v[3] = pack_2s(box->x1 + dst_dx, box->y2 + dst_dy);
v[6] = pack_2s(box->x1 + dst_dx, box->y1 + dst_dy);
v[0] = pack_2s(box->x2, box->y2);
v[3] = pack_2s(box->x1, box->y2);
v[6] = pack_2s(box->x1, box->y1);
v[1] = (box->x2 + src_dx) * tmp.src.scale[0];
v[7] = v[4] = (box->x1 + src_dx) * tmp.src.scale[0];