Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/gen4+: Tidy emit_spans_affine() 

gcc produced abysmal code for the inlined emission, so hand unroll it
for sanity.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-12-28 17:08:00 +00:00
parent 5d222d4d21
commit fdd6d222bc
2 changed files with 72 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/sna/gen4_vertex.c
View File

@ -437,30 +437,24 @@ emit_primitive_affine_source(struct sna *sna,
dst.p.x = r->dst.x + r->width;
dst.p.y = r->dst.y + r->height;
v[0] = dst.f;
_sna_get_transformed_coordinates(op->src.offset[0] + r->src.x + r->width,
op->src.offset[1] + r->src.y + r->height,
op->src.transform,
&v[1], &v[2]);
v[1] *= op->src.scale[0];
v[2] *= op->src.scale[1];
_sna_get_transformed_scaled(op->src.offset[0] + r->src.x + r->width,
op->src.offset[1] + r->src.y + r->height,
op->src.transform, op->src.scale,
&v[1], &v[2]);
dst.p.x = r->dst.x;
v[3] = dst.f;
_sna_get_transformed_coordinates(op->src.offset[0] + r->src.x,
op->src.offset[1] + r->src.y + r->height,
op->src.transform,
&v[4], &v[5]);
v[4] *= op->src.scale[0];
v[5] *= op->src.scale[1];
_sna_get_transformed_scaled(op->src.offset[0] + r->src.x,
op->src.offset[1] + r->src.y + r->height,
op->src.transform, op->src.scale,
&v[4], &v[5]);
dst.p.y = r->dst.y;
v[6] = dst.f;
_sna_get_transformed_coordinates(op->src.offset[0] + r->src.x,
op->src.offset[1] + r->src.y,
op->src.transform,
&v[7], &v[8]);
v[7] *= op->src.scale[0];
v[8] *= op->src.scale[1];
_sna_get_transformed_scaled(op->src.offset[0] + r->src.x,
op->src.offset[1] + r->src.y,
op->src.transform, op->src.scale,
&v[7], &v[8]);
}
fastcall static void
@ -629,34 +623,28 @@ emit_primitive_affine_source_identity(struct sna *sna,
dst.p.x = r->dst.x + r->width;
dst.p.y = r->dst.y + r->height;
v[0] = dst.f;
_sna_get_transformed_coordinates(op->src.offset[0] + r->src.x + r->width,
op->src.offset[1] + r->src.y + r->height,
op->src.transform,
&v[1], &v[2]);
v[1] *= op->src.scale[0];
v[2] *= op->src.scale[1];
_sna_get_transformed_scaled(op->src.offset[0] + r->src.x + r->width,
op->src.offset[1] + r->src.y + r->height,
op->src.transform, op->src.scale,
&v[1], &v[2]);
v[3] = (msk_x + w) * op->mask.scale[0];
v[4] = (msk_y + h) * op->mask.scale[1];
dst.p.x = r->dst.x;
v[5] = dst.f;
_sna_get_transformed_coordinates(op->src.offset[0] + r->src.x,
op->src.offset[1] + r->src.y + r->height,
op->src.transform,
&v[6], &v[7]);
v[6] *= op->src.scale[0];
v[7] *= op->src.scale[1];
_sna_get_transformed_scaled(op->src.offset[0] + r->src.x,
op->src.offset[1] + r->src.y + r->height,
op->src.transform, op->src.scale,
&v[6], &v[7]);
v[8] = msk_x * op->mask.scale[0];
v[9] = v[4];
dst.p.y = r->dst.y;
v[10] = dst.f;
_sna_get_transformed_coordinates(op->src.offset[0] + r->src.x,
op->src.offset[1] + r->src.y,
op->src.transform,
&v[11], &v[12]);
v[11] *= op->src.scale[0];
v[12] *= op->src.scale[1];
_sna_get_transformed_scaled(op->src.offset[0] + r->src.x,
op->src.offset[1] + r->src.y,
op->src.transform, op->src.scale,
&v[11], &v[12]);
v[13] = v[8];
v[14] = msk_y * op->mask.scale[1];
}
@ -873,17 +861,43 @@ emit_spans_affine(struct sna *sna,
const BoxRec *box,
float opacity)
{
OUT_VERTEX(box->x2, box->y2);
emit_composite_texcoord_affine(sna, &op->base.src, box->x2, box->y2);
OUT_VERTEX_F(opacity);
union {
struct sna_coordinate p;
float f;
} dst;
float *v;
OUT_VERTEX(box->x1, box->y2);
emit_composite_texcoord_affine(sna, &op->base.src, box->x1, box->y2);
OUT_VERTEX_F(opacity);
assert(op->base.floats_per_rect == 12);
assert((sna->render.vertex_used % 4) == 0);
v = sna->render.vertices + sna->render.vertex_used;
sna->render.vertex_used += 12;
OUT_VERTEX(box->x1, box->y1);
emit_composite_texcoord_affine(sna, &op->base.src, box->x1, box->y1);
OUT_VERTEX_F(opacity);
dst.p.x = box->x2;
dst.p.y = box->y2;
v[0] = dst.f;
_sna_get_transformed_scaled(op->base.src.offset[0] + box->x2,
op->base.src.offset[1] + box->y2,
op->base.src.transform,
op->base.src.scale,
&v[1], &v[2]);
dst.p.x = box->x1;
v[4] = dst.f;
_sna_get_transformed_scaled(op->base.src.offset[0] + box->x1,
op->base.src.offset[1] + box->y2,
op->base.src.transform,
op->base.src.scale,
&v[5], &v[6]);
dst.p.y = box->y1;
v[8] = dst.f;
_sna_get_transformed_scaled(op->base.src.offset[0] + box->x1,
op->base.src.offset[1] + box->y1,
op->base.src.transform,
op->base.src.scale,
&v[9], &v[10]);
v[11] = v[7] = v[3] = opacity;
}
void gen4_choose_spans_emitter(struct sna_composite_spans_op *tmp)

13
src/sna/sna.h
View File

@ -604,6 +604,19 @@ _sna_get_transformed_coordinates(int x, int y,
*y_out = result[1] / (double)result[2];
}
static inline void
_sna_get_transformed_scaled(int x, int y,
const PictTransform *transform, const float *sf,
float *x_out, float *y_out)
{
int64_t result[3];
_sna_transform_point(transform, x, y, result);
*x_out = result[0] * sf[0] / (double)result[2];
*y_out = result[1] * sf[1] / (double)result[2];
}
void
sna_get_transformed_coordinates(int x, int y,
const PictTransform *transform,