xf86-video-intel: 2 commits - src/intel_module.c src/sna/gen4_render.c src/sna/gen5_render.c src/sna/gen6_render.c src/sna/gen7_render.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Dec 6 09:12:36 PST 2012
src/intel_module.c | 7 +------
src/sna/gen4_render.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
src/sna/gen5_render.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
src/sna/gen6_render.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
src/sna/gen7_render.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
5 files changed, 181 insertions(+), 14 deletions(-)
New commits:
commit 7f4d4afa629bd18be89d7270e6178a865cf9586e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Dec 6 17:08:15 2012 +0000
Fix compilation of UMS probe following 13f47008ec
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel_module.c b/src/intel_module.c
index 0b96942..19b6501 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -485,13 +485,8 @@ intel_scrn_create(DriverPtr driver,
xf86AddEntityToScreen(scrn, entity_num);
#if !KMS_ONLY
- switch (DEVICE_ID(device)) {
- case PCI_CHIP_I810:
- case PCI_CHIP_I810_DC100:
- case PCI_CHIP_I810_E:
- case PCI_CHIP_I815:
+ if (((struct intel_device_info *)match_data)->gen < 020)
return lg_i810_init(scrn);
- }
#endif
#if !UMS_ONLY
commit d733f7d1f1dc343ac34c4a27ac99d71fc0572bc2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Dec 6 16:55:00 2012 +0000
sna/gen4+: Add common glyph-to-dst emitters
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index 4e8ad57..18a6bf6 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -783,6 +783,45 @@ gen4_emit_composite_primitive_affine_source(struct sna *sna,
}
fastcall static void
+gen4_emit_composite_primitive_identity_mask(struct sna *sna,
+ const struct sna_composite_op *op,
+ const struct sna_composite_rectangles *r)
+{
+ union {
+ struct sna_coordinate p;
+ float f;
+ } dst;
+ float msk_x, msk_y;
+ float w, h;
+ float *v;
+
+ msk_x = r->mask.x + op->mask.offset[0];
+ msk_y = r->mask.y + op->mask.offset[1];
+ w = r->width;
+ h = r->height;
+
+ v = sna->render.vertices + sna->render.vertex_used;
+ sna->render.vertex_used += 15;
+
+ dst.p.x = r->dst.x + r->width;
+ dst.p.y = r->dst.y + r->height;
+ v[0] = dst.f;
+ v[3] = (msk_x + w) * op->mask.scale[0];
+ v[9] = v[4] = (msk_y + h) * op->mask.scale[1];
+
+ dst.p.x = r->dst.x;
+ v[5] = dst.f;
+ v[13] = v[8] = msk_x * op->mask.scale[0];
+
+ dst.p.y = r->dst.y;
+ v[10] = dst.f;
+ v[14] = msk_y * op->mask.scale[1];
+
+ v[7] = v[2] = v[1] = 1;
+ v[12] = v[11] = v[6] = 0;
+}
+
+fastcall static void
gen4_emit_composite_primitive_identity_source_mask(struct sna *sna,
const struct sna_composite_op *op,
const struct sna_composite_rectangles *r)
@@ -2387,8 +2426,12 @@ gen4_render_composite(struct sna *sna,
tmp->is_affine &= tmp->mask.is_affine;
- if (tmp->src.transform == NULL && tmp->mask.transform == NULL)
- tmp->prim_emit = gen4_emit_composite_primitive_identity_source_mask;
+ if (tmp->src.transform == NULL && tmp->mask.transform == NULL) {
+ if (tmp->src.is_solid)
+ tmp->prim_emit = gen4_emit_composite_primitive_identity_mask;
+ else
+ tmp->prim_emit = gen4_emit_composite_primitive_identity_source_mask;
+ }
tmp->floats_per_vertex = 5 + 2 * !tmp->is_affine;
} else {
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 49542cc..284e8da 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -778,6 +778,45 @@ gen5_emit_composite_primitive_affine_source(struct sna *sna,
}
fastcall static void
+gen5_emit_composite_primitive_identity_mask(struct sna *sna,
+ const struct sna_composite_op *op,
+ const struct sna_composite_rectangles *r)
+{
+ union {
+ struct sna_coordinate p;
+ float f;
+ } dst;
+ float msk_x, msk_y;
+ float w, h;
+ float *v;
+
+ msk_x = r->mask.x + op->mask.offset[0];
+ msk_y = r->mask.y + op->mask.offset[1];
+ w = r->width;
+ h = r->height;
+
+ v = sna->render.vertices + sna->render.vertex_used;
+ sna->render.vertex_used += 15;
+
+ dst.p.x = r->dst.x + r->width;
+ dst.p.y = r->dst.y + r->height;
+ v[0] = dst.f;
+ v[3] = (msk_x + w) * op->mask.scale[0];
+ v[9] = v[4] = (msk_y + h) * op->mask.scale[1];
+
+ dst.p.x = r->dst.x;
+ v[5] = dst.f;
+ v[13] = v[8] = msk_x * op->mask.scale[0];
+
+ dst.p.y = r->dst.y;
+ v[10] = dst.f;
+ v[14] = msk_y * op->mask.scale[1];
+
+ v[7] = v[2] = v[1] = 1;
+ v[12] = v[11] = v[6] = 0;
+}
+
+fastcall static void
gen5_emit_composite_primitive_identity_source_mask(struct sna *sna,
const struct sna_composite_op *op,
const struct sna_composite_rectangles *r)
@@ -2393,8 +2432,12 @@ gen5_render_composite(struct sna *sna,
tmp->is_affine &= tmp->mask.is_affine;
- if (tmp->src.transform == NULL && tmp->mask.transform == NULL)
- tmp->prim_emit = gen5_emit_composite_primitive_identity_source_mask;
+ if (tmp->src.transform == NULL && tmp->mask.transform == NULL) {
+ if (tmp->src.is_solid)
+ tmp->prim_emit = gen5_emit_composite_primitive_identity_mask;
+ else
+ tmp->prim_emit = gen5_emit_composite_primitive_identity_source_mask;
+ }
tmp->floats_per_vertex = 5 + 2 * !tmp->is_affine;
} else {
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 3706460..6e2242b 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1405,6 +1405,45 @@ gen6_emit_composite_primitive_affine_source(struct sna *sna,
}
fastcall static void
+gen6_emit_composite_primitive_identity_mask(struct sna *sna,
+ const struct sna_composite_op *op,
+ const struct sna_composite_rectangles *r)
+{
+ union {
+ struct sna_coordinate p;
+ float f;
+ } dst;
+ float msk_x, msk_y;
+ float w, h;
+ float *v;
+
+ msk_x = r->mask.x + op->mask.offset[0];
+ msk_y = r->mask.y + op->mask.offset[1];
+ w = r->width;
+ h = r->height;
+
+ v = sna->render.vertices + sna->render.vertex_used;
+ sna->render.vertex_used += 15;
+
+ dst.p.x = r->dst.x + r->width;
+ dst.p.y = r->dst.y + r->height;
+ v[0] = dst.f;
+ v[3] = (msk_x + w) * op->mask.scale[0];
+ v[9] = v[4] = (msk_y + h) * op->mask.scale[1];
+
+ dst.p.x = r->dst.x;
+ v[5] = dst.f;
+ v[13] = v[8] = msk_x * op->mask.scale[0];
+
+ dst.p.y = r->dst.y;
+ v[10] = dst.f;
+ v[14] = msk_y * op->mask.scale[1];
+
+ v[7] = v[2] = v[1] = 1;
+ v[12] = v[11] = v[6] = 0;
+}
+
+fastcall static void
gen6_emit_composite_primitive_identity_source_mask(struct sna *sna,
const struct sna_composite_op *op,
const struct sna_composite_rectangles *r)
@@ -2750,8 +2789,12 @@ gen6_render_composite(struct sna *sna,
tmp->is_affine &= tmp->mask.is_affine;
- if (tmp->src.transform == NULL && tmp->mask.transform == NULL)
- tmp->prim_emit = gen6_emit_composite_primitive_identity_source_mask;
+ if (tmp->src.transform == NULL && tmp->mask.transform == NULL) {
+ if (tmp->src.is_solid)
+ tmp->prim_emit = gen6_emit_composite_primitive_identity_mask;
+ else
+ tmp->prim_emit = gen6_emit_composite_primitive_identity_source_mask;
+ }
tmp->floats_per_vertex = 5 + 2 * !tmp->is_affine;
} else {
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 18c9036..575d67a 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1527,6 +1527,45 @@ gen7_emit_composite_primitive_affine_source(struct sna *sna,
}
fastcall static void
+gen7_emit_composite_primitive_identity_mask(struct sna *sna,
+ const struct sna_composite_op *op,
+ const struct sna_composite_rectangles *r)
+{
+ union {
+ struct sna_coordinate p;
+ float f;
+ } dst;
+ float msk_x, msk_y;
+ float w, h;
+ float *v;
+
+ msk_x = r->mask.x + op->mask.offset[0];
+ msk_y = r->mask.y + op->mask.offset[1];
+ w = r->width;
+ h = r->height;
+
+ v = sna->render.vertices + sna->render.vertex_used;
+ sna->render.vertex_used += 15;
+
+ dst.p.x = r->dst.x + r->width;
+ dst.p.y = r->dst.y + r->height;
+ v[0] = dst.f;
+ v[3] = (msk_x + w) * op->mask.scale[0];
+ v[9] = v[4] = (msk_y + h) * op->mask.scale[1];
+
+ dst.p.x = r->dst.x;
+ v[5] = dst.f;
+ v[13] = v[8] = msk_x * op->mask.scale[0];
+
+ dst.p.y = r->dst.y;
+ v[10] = dst.f;
+ v[14] = msk_y * op->mask.scale[1];
+
+ v[7] = v[2] = v[1] = 1;
+ v[12] = v[11] = v[6] = 0;
+}
+
+fastcall static void
gen7_emit_composite_primitive_identity_source_mask(struct sna *sna,
const struct sna_composite_op *op,
const struct sna_composite_rectangles *r)
@@ -2867,8 +2906,12 @@ gen7_render_composite(struct sna *sna,
tmp->is_affine &= tmp->mask.is_affine;
- if (tmp->src.transform == NULL && tmp->mask.transform == NULL)
- tmp->prim_emit = gen7_emit_composite_primitive_identity_source_mask;
+ if (tmp->src.transform == NULL && tmp->mask.transform == NULL) {
+ if (tmp->src.is_solid)
+ tmp->prim_emit = gen7_emit_composite_primitive_identity_mask;
+ else
+ tmp->prim_emit = gen7_emit_composite_primitive_identity_source_mask;
+ }
tmp->floats_per_vertex = 5 + 2 * !tmp->is_affine;
} else {
More information about the xorg-commit
mailing list