sna/gen6: Add poor-man's linear implementation
Still no JIT, in the meantime we can at least cache the gradient ramps. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
parent
232972c0e5
commit
dcc364a7b1
|
|
@ -1420,141 +1420,72 @@ gen6_emit_composite_primitive_identity_source_mask(struct sna *sna,
|
|||
v[14] = msk_y * op->mask.scale[1];
|
||||
}
|
||||
|
||||
inline static void
|
||||
gen6_emit_composite_texcoord(struct sna *sna,
|
||||
const struct sna_composite_channel *channel,
|
||||
int16_t x, int16_t y)
|
||||
{
|
||||
x += channel->offset[0];
|
||||
y += channel->offset[1];
|
||||
|
||||
if (channel->is_affine) {
|
||||
float s, t;
|
||||
|
||||
sna_get_transformed_coordinates(x, y,
|
||||
channel->transform,
|
||||
&s, &t);
|
||||
OUT_VERTEX_F(s * channel->scale[0]);
|
||||
OUT_VERTEX_F(t * channel->scale[1]);
|
||||
} else {
|
||||
float s, t, w;
|
||||
|
||||
sna_get_transformed_coordinates_3d(x, y,
|
||||
channel->transform,
|
||||
&s, &t, &w);
|
||||
OUT_VERTEX_F(s * channel->scale[0]);
|
||||
OUT_VERTEX_F(t * channel->scale[1]);
|
||||
OUT_VERTEX_F(w);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gen6_emit_composite_vertex(struct sna *sna,
|
||||
const struct sna_composite_op *op,
|
||||
int16_t srcX, int16_t srcY,
|
||||
int16_t mskX, int16_t mskY,
|
||||
int16_t dstX, int16_t dstY)
|
||||
{
|
||||
OUT_VERTEX(dstX, dstY);
|
||||
gen6_emit_composite_texcoord(sna, &op->src, srcX, srcY);
|
||||
gen6_emit_composite_texcoord(sna, &op->mask, mskX, mskY);
|
||||
}
|
||||
|
||||
fastcall static void
|
||||
gen6_emit_composite_primitive(struct sna *sna,
|
||||
const struct sna_composite_op *op,
|
||||
const struct sna_composite_rectangles *r)
|
||||
{
|
||||
float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
|
||||
Bool is_affine = op->is_affine;
|
||||
const float *src_sf = op->src.scale;
|
||||
const float *mask_sf = op->mask.scale;
|
||||
|
||||
if (is_affine) {
|
||||
sna_get_transformed_coordinates(r->src.x + op->src.offset[0],
|
||||
r->src.y + op->src.offset[1],
|
||||
op->src.transform,
|
||||
&src_x[0],
|
||||
&src_y[0]);
|
||||
|
||||
sna_get_transformed_coordinates(r->src.x + op->src.offset[0],
|
||||
r->src.y + op->src.offset[1] + r->height,
|
||||
op->src.transform,
|
||||
&src_x[1],
|
||||
&src_y[1]);
|
||||
|
||||
sna_get_transformed_coordinates(r->src.x + op->src.offset[0] + r->width,
|
||||
r->src.y + op->src.offset[1] + r->height,
|
||||
op->src.transform,
|
||||
&src_x[2],
|
||||
&src_y[2]);
|
||||
} else {
|
||||
if (!sna_get_transformed_coordinates_3d(r->src.x + op->src.offset[0],
|
||||
r->src.y + op->src.offset[1],
|
||||
op->src.transform,
|
||||
&src_x[0],
|
||||
&src_y[0],
|
||||
&src_w[0]))
|
||||
return;
|
||||
|
||||
if (!sna_get_transformed_coordinates_3d(r->src.x + op->src.offset[0],
|
||||
r->src.y + op->src.offset[1] + r->height,
|
||||
op->src.transform,
|
||||
&src_x[1],
|
||||
&src_y[1],
|
||||
&src_w[1]))
|
||||
return;
|
||||
|
||||
if (!sna_get_transformed_coordinates_3d(r->src.x + op->src.offset[0] + r->width,
|
||||
r->src.y + op->src.offset[1] + r->height,
|
||||
op->src.transform,
|
||||
&src_x[2],
|
||||
&src_y[2],
|
||||
&src_w[2]))
|
||||
return;
|
||||
}
|
||||
|
||||
if (op->mask.bo) {
|
||||
if (is_affine) {
|
||||
sna_get_transformed_coordinates(r->mask.x + op->mask.offset[0],
|
||||
r->mask.y + op->mask.offset[1],
|
||||
op->mask.transform,
|
||||
&mask_x[0],
|
||||
&mask_y[0]);
|
||||
|
||||
sna_get_transformed_coordinates(r->mask.x + op->mask.offset[0],
|
||||
r->mask.y + op->mask.offset[1] + r->height,
|
||||
op->mask.transform,
|
||||
&mask_x[1],
|
||||
&mask_y[1]);
|
||||
|
||||
sna_get_transformed_coordinates(r->mask.x + op->mask.offset[0] + r->width,
|
||||
r->mask.y + op->mask.offset[1] + r->height,
|
||||
op->mask.transform,
|
||||
&mask_x[2],
|
||||
&mask_y[2]);
|
||||
} else {
|
||||
if (!sna_get_transformed_coordinates_3d(r->mask.x + op->mask.offset[0],
|
||||
r->mask.y + op->mask.offset[1],
|
||||
op->mask.transform,
|
||||
&mask_x[0],
|
||||
&mask_y[0],
|
||||
&mask_w[0]))
|
||||
return;
|
||||
|
||||
if (!sna_get_transformed_coordinates_3d(r->mask.x + op->mask.offset[0],
|
||||
r->mask.y + op->mask.offset[1] + r->height,
|
||||
op->mask.transform,
|
||||
&mask_x[1],
|
||||
&mask_y[1],
|
||||
&mask_w[1]))
|
||||
return;
|
||||
|
||||
if (!sna_get_transformed_coordinates_3d(r->mask.x + op->mask.offset[0] + r->width,
|
||||
r->mask.y + op->mask.offset[1] + r->height,
|
||||
op->mask.transform,
|
||||
&mask_x[2],
|
||||
&mask_y[2],
|
||||
&mask_w[2]))
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
OUT_VERTEX(r->dst.x + r->width, r->dst.y + r->height);
|
||||
OUT_VERTEX_F(src_x[2] * src_sf[0]);
|
||||
OUT_VERTEX_F(src_y[2] * src_sf[1]);
|
||||
if (!is_affine)
|
||||
OUT_VERTEX_F(src_w[2]);
|
||||
if (op->mask.bo) {
|
||||
OUT_VERTEX_F(mask_x[2] * mask_sf[0]);
|
||||
OUT_VERTEX_F(mask_y[2] * mask_sf[1]);
|
||||
if (!is_affine)
|
||||
OUT_VERTEX_F(mask_w[2]);
|
||||
}
|
||||
|
||||
OUT_VERTEX(r->dst.x, r->dst.y + r->height);
|
||||
OUT_VERTEX_F(src_x[1] * src_sf[0]);
|
||||
OUT_VERTEX_F(src_y[1] * src_sf[1]);
|
||||
if (!is_affine)
|
||||
OUT_VERTEX_F(src_w[1]);
|
||||
if (op->mask.bo) {
|
||||
OUT_VERTEX_F(mask_x[1] * mask_sf[0]);
|
||||
OUT_VERTEX_F(mask_y[1] * mask_sf[1]);
|
||||
if (!is_affine)
|
||||
OUT_VERTEX_F(mask_w[1]);
|
||||
}
|
||||
|
||||
OUT_VERTEX(r->dst.x, r->dst.y);
|
||||
OUT_VERTEX_F(src_x[0] * src_sf[0]);
|
||||
OUT_VERTEX_F(src_y[0] * src_sf[1]);
|
||||
if (!is_affine)
|
||||
OUT_VERTEX_F(src_w[0]);
|
||||
if (op->mask.bo) {
|
||||
OUT_VERTEX_F(mask_x[0] * mask_sf[0]);
|
||||
OUT_VERTEX_F(mask_y[0] * mask_sf[1]);
|
||||
if (!is_affine)
|
||||
OUT_VERTEX_F(mask_w[0]);
|
||||
}
|
||||
gen6_emit_composite_vertex(sna, op,
|
||||
r->src.x + r->width,
|
||||
r->src.y + r->height,
|
||||
r->mask.x + r->width,
|
||||
r->mask.y + r->height,
|
||||
op->dst.x + r->dst.x + r->width,
|
||||
op->dst.y + r->dst.y + r->height);
|
||||
gen6_emit_composite_vertex(sna, op,
|
||||
r->src.x,
|
||||
r->src.y + r->height,
|
||||
r->mask.x,
|
||||
r->mask.y + r->height,
|
||||
op->dst.x + r->dst.x,
|
||||
op->dst.y + r->dst.y + r->height);
|
||||
gen6_emit_composite_vertex(sna, op,
|
||||
r->src.x,
|
||||
r->src.y,
|
||||
r->mask.x,
|
||||
r->mask.y,
|
||||
op->dst.x + r->dst.x,
|
||||
op->dst.y + r->dst.y);
|
||||
}
|
||||
|
||||
static void gen6_emit_vertex_buffer(struct sna *sna,
|
||||
|
|
@ -2123,6 +2054,120 @@ gen6_composite_solid_init(struct sna *sna,
|
|||
return channel->bo != NULL;
|
||||
}
|
||||
|
||||
static Bool
|
||||
gen6_composite_linear_init(struct sna *sna,
|
||||
PicturePtr picture,
|
||||
struct sna_composite_channel *channel,
|
||||
int x, int y,
|
||||
int w, int h,
|
||||
int dst_x, int dst_y)
|
||||
{
|
||||
PictLinearGradient *linear =
|
||||
(PictLinearGradient *)picture->pSourcePict;
|
||||
pixman_fixed_t tx, ty;
|
||||
float x0, y0, sf;
|
||||
float dx, dy;
|
||||
|
||||
DBG(("%s: p1=(%f, %f), p2=(%f, %f), src=(%d, %d), dst=(%d, %d), size=(%d, %d)\n",
|
||||
__FUNCTION__,
|
||||
pixman_fixed_to_double(linear->p1.x), pixman_fixed_to_double(linear->p1.y),
|
||||
pixman_fixed_to_double(linear->p2.x), pixman_fixed_to_double(linear->p2.y),
|
||||
x, y, dst_x, dst_y, w, h));
|
||||
|
||||
if (linear->p2.x == linear->p1.x && linear->p2.y == linear->p1.y)
|
||||
return 0;
|
||||
|
||||
if (!sna_transform_is_affine(picture->transform)) {
|
||||
DBG(("%s: fallback due to projective transform\n",
|
||||
__FUNCTION__));
|
||||
return sna_render_picture_fixup(sna, picture, channel,
|
||||
x, y, w, h, dst_x, dst_y);
|
||||
}
|
||||
|
||||
channel->bo = sna_render_get_gradient(sna, (PictGradient *)linear);
|
||||
if (!channel->bo)
|
||||
return 0;
|
||||
|
||||
channel->filter = PictFilterBilinear;
|
||||
channel->repeat = picture->repeat ? picture->repeatType : RepeatNone;
|
||||
channel->width = channel->bo->pitch / 4;
|
||||
channel->height = 1;
|
||||
channel->pict_format = PICT_a8r8g8b8;
|
||||
|
||||
channel->scale[0] = channel->scale[1] = 1;
|
||||
channel->offset[0] = channel->offset[1] = 0;
|
||||
|
||||
if (sna_transform_is_translation(picture->transform, &tx, &ty)) {
|
||||
dx = pixman_fixed_to_double(linear->p2.x - linear->p1.x);
|
||||
dy = pixman_fixed_to_double(linear->p2.y - linear->p1.y);
|
||||
|
||||
x0 = pixman_fixed_to_double(linear->p1.x);
|
||||
y0 = pixman_fixed_to_double(linear->p1.y);
|
||||
|
||||
if (tx | ty) {
|
||||
x0 -= pixman_fixed_to_double(tx);
|
||||
y0 -= pixman_fixed_to_double(ty);
|
||||
}
|
||||
} else {
|
||||
struct pixman_f_vector p1, p2;
|
||||
struct pixman_f_transform m, inv;
|
||||
|
||||
pixman_f_transform_from_pixman_transform(&m, picture->transform);
|
||||
DBG(("%s: transform = [%f %f %f, %f %f %f, %f %f %f]\n",
|
||||
__FUNCTION__,
|
||||
m.m[0][0], m.m[0][1], m.m[0][2],
|
||||
m.m[1][0], m.m[1][1], m.m[1][2],
|
||||
m.m[2][0], m.m[2][1], m.m[2][2]));
|
||||
if (!pixman_f_transform_invert(&inv, &m))
|
||||
return 0;
|
||||
|
||||
p1.v[0] = pixman_fixed_to_double(linear->p1.x);
|
||||
p1.v[1] = pixman_fixed_to_double(linear->p1.y);
|
||||
p1.v[2] = 1.;
|
||||
pixman_f_transform_point(&inv, &p1);
|
||||
|
||||
p2.v[0] = pixman_fixed_to_double(linear->p2.x);
|
||||
p2.v[1] = pixman_fixed_to_double(linear->p2.y);
|
||||
p2.v[2] = 1.;
|
||||
pixman_f_transform_point(&inv, &p2);
|
||||
|
||||
DBG(("%s: untransformed: p1=(%f, %f, %f), p2=(%f, %f, %f)\n",
|
||||
__FUNCTION__,
|
||||
p1.v[0], p1.v[1], p1.v[2],
|
||||
p2.v[0], p2.v[1], p2.v[2]));
|
||||
|
||||
dx = p2.v[0] - p1.v[0];
|
||||
dy = p2.v[1] - p1.v[1];
|
||||
|
||||
x0 = p1.v[0];
|
||||
y0 = p1.v[1];
|
||||
}
|
||||
|
||||
sf = dx*dx + dy*dy;
|
||||
dx /= sf;
|
||||
dy /= sf;
|
||||
|
||||
channel->embedded_transform.matrix[0][0] = pixman_double_to_fixed(dx);
|
||||
channel->embedded_transform.matrix[0][1] = pixman_double_to_fixed(dy);
|
||||
channel->embedded_transform.matrix[0][2] = -pixman_double_to_fixed(dx*(x0+dst_x-x) + dy*(y0+dst_y-y));
|
||||
|
||||
channel->embedded_transform.matrix[1][0] = 0;
|
||||
channel->embedded_transform.matrix[1][1] = 0;
|
||||
channel->embedded_transform.matrix[1][2] = pixman_double_to_fixed(.5);
|
||||
|
||||
channel->embedded_transform.matrix[2][0] = 0;
|
||||
channel->embedded_transform.matrix[2][1] = 0;
|
||||
channel->embedded_transform.matrix[2][2] = pixman_fixed_1;
|
||||
|
||||
channel->transform = &channel->embedded_transform;
|
||||
channel->is_affine = 1;
|
||||
|
||||
DBG(("%s: dx=%f, dy=%f, offset=%f\n",
|
||||
__FUNCTION__, dx, dy, -dx*(x0-x+dst_x) + -dy*(y0-y+dst_y)));
|
||||
|
||||
return channel->bo != NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
gen6_composite_picture(struct sna *sna,
|
||||
PicturePtr picture,
|
||||
|
|
@ -2144,12 +2189,20 @@ gen6_composite_picture(struct sna *sna,
|
|||
if (sna_picture_is_solid(picture, &color))
|
||||
return gen6_composite_solid_init(sna, channel, color);
|
||||
|
||||
if (picture->pDrawable == NULL)
|
||||
if (picture->pDrawable == NULL) {
|
||||
if (picture->pSourcePict->type == SourcePictTypeLinear)
|
||||
return gen6_composite_linear_init(sna, picture, channel,
|
||||
x, y,
|
||||
w, h,
|
||||
dst_x, dst_y);
|
||||
|
||||
DBG(("%s -- fixup, gradient\n", __FUNCTION__));
|
||||
return sna_render_picture_fixup(sna, picture, channel,
|
||||
x, y, w, h, dst_x, dst_y);
|
||||
}
|
||||
|
||||
if (picture->alphaMap) {
|
||||
DBG(("%s -- fallback, alphamap\n", __FUNCTION__));
|
||||
DBG(("%s -- fixup, alphamap\n", __FUNCTION__));
|
||||
return sna_render_picture_fixup(sna, picture, channel,
|
||||
x, y, w, h, dst_x, dst_y);
|
||||
}
|
||||
|
|
@ -2326,7 +2379,13 @@ is_gradient(PicturePtr picture)
|
|||
if (picture->pDrawable)
|
||||
return FALSE;
|
||||
|
||||
return picture->pSourcePict->type != SourcePictTypeSolidFill;
|
||||
switch (picture->pSourcePict->type) {
|
||||
case SourcePictTypeSolidFill:
|
||||
case SourcePictTypeLinear:
|
||||
return FALSE;
|
||||
default:
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
static bool
|
||||
|
|
@ -2739,32 +2798,6 @@ gen6_composite_alpha_gradient_init(struct sna *sna,
|
|||
return channel->bo != NULL;
|
||||
}
|
||||
|
||||
inline static void
|
||||
gen6_emit_composite_texcoord(struct sna *sna,
|
||||
const struct sna_composite_channel *channel,
|
||||
int16_t x, int16_t y)
|
||||
{
|
||||
float t[3];
|
||||
|
||||
if (channel->is_affine) {
|
||||
sna_get_transformed_coordinates(x + channel->offset[0],
|
||||
y + channel->offset[1],
|
||||
channel->transform,
|
||||
&t[0], &t[1]);
|
||||
OUT_VERTEX_F(t[0] * channel->scale[0]);
|
||||
OUT_VERTEX_F(t[1] * channel->scale[1]);
|
||||
} else {
|
||||
t[0] = t[1] = 0; t[2] = 1;
|
||||
sna_get_transformed_coordinates_3d(x + channel->offset[0],
|
||||
y + channel->offset[1],
|
||||
channel->transform,
|
||||
&t[0], &t[1], &t[2]);
|
||||
OUT_VERTEX_F(t[0] * channel->scale[0]);
|
||||
OUT_VERTEX_F(t[1] * channel->scale[1]);
|
||||
OUT_VERTEX_F(t[2]);
|
||||
}
|
||||
}
|
||||
|
||||
inline static void
|
||||
gen6_emit_composite_texcoord_affine(struct sna *sna,
|
||||
const struct sna_composite_channel *channel,
|
||||
|
|
|
|||
Loading…
Reference in New Issue