summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-09-12 11:54:02 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-09-12 11:54:02 +0100
commitf2a617dcc5fbeaf503db4777f0ec7b3d862085b9 (patch)
tree9cb85f68a2e6debef3d839459b092c1416294028
parentc2e19987c333de31b258a3af37a2ed1f63ef949a (diff)
sna: Use single precision for computing the texcoord scale factor
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/gen2_render.c4
-rw-r--r--src/sna/gen3_render.c4
-rw-r--r--src/sna/gen4_render.c8
-rw-r--r--src/sna/gen5_render.c8
-rw-r--r--src/sna/gen6_render.c4
-rw-r--r--src/sna/gen7_render.c4
-rw-r--r--src/sna/sna_render.c24
7 files changed, 28 insertions, 28 deletions
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index ff200325..ce6dcedd 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -2019,8 +2019,8 @@ gen2_render_copy_setup_source(struct sna *sna,
channel->repeat = RepeatNone;
channel->width = pixmap->drawable.width;
channel->height = pixmap->drawable.height;
- channel->scale[0] = 1./pixmap->drawable.width;
- channel->scale[1] = 1./pixmap->drawable.height;
+ channel->scale[0] = 1.f/pixmap->drawable.width;
+ channel->scale[1] = 1.f/pixmap->drawable.height;
channel->offset[0] = 0;
channel->offset[1] = 0;
channel->pict_format = sna_format_for_depth(pixmap->drawable.depth);
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 85263016..429d504e 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -3233,8 +3233,8 @@ gen3_render_copy_setup_source(struct sna *sna,
channel->repeat = gen3_texture_repeat(RepeatNone);
channel->width = pixmap->drawable.width;
channel->height = pixmap->drawable.height;
- channel->scale[0] = 1./pixmap->drawable.width;
- channel->scale[1] = 1./pixmap->drawable.height;
+ channel->scale[0] = 1.f/pixmap->drawable.width;
+ channel->scale[1] = 1.f/pixmap->drawable.height;
channel->offset[0] = 0;
channel->offset[1] = 0;
gen3_composite_channel_set_format(channel,
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index bddc681b..d2b3746c 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -2224,8 +2224,8 @@ gen4_render_copy_boxes(struct sna *sna, uint8_t alu,
gen4_copy_bind_surfaces(sna, &tmp);
gen4_align_vertex(sna, &tmp);
- tmp.src.scale[0] = 1. / src->drawable.width;
- tmp.src.scale[1] = 1. / src->drawable.height;
+ tmp.src.scale[0] = 1.f/src->drawable.width;
+ tmp.src.scale[1] = 1.f/src->drawable.height;
do {
gen4_render_copy_one(sna, &tmp,
box->x1 + src_dx, box->y1 + src_dy,
@@ -2303,8 +2303,8 @@ gen4_render_copy(struct sna *sna, uint8_t alu,
gen4_get_card_format_for_depth(src->drawable.depth),
op->base.src.width = src->drawable.width;
op->base.src.height = src->drawable.height;
- op->base.src.scale[0] = 1./src->drawable.width;
- op->base.src.scale[1] = 1./src->drawable.height;
+ op->base.src.scale[0] = 1.f/src->drawable.width;
+ op->base.src.scale[1] = 1.f/src->drawable.height;
op->base.src.filter = SAMPLER_FILTER_NEAREST;
op->base.src.repeat = SAMPLER_EXTEND_NONE;
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 703b3612..f60c0818 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -2163,8 +2163,8 @@ gen5_render_copy_boxes(struct sna *sna, uint8_t alu,
gen5_copy_bind_surfaces(sna, &tmp);
gen5_align_vertex(sna, &tmp);
- tmp.src.scale[0] = 1. / src->drawable.width;
- tmp.src.scale[1] = 1. / src->drawable.height;
+ tmp.src.scale[0] = 1.f/src->drawable.width;
+ tmp.src.scale[1] = 1.f/src->drawable.height;
do {
int n_this_time = gen5_get_rectangles(sna, &tmp, n);
if (n_this_time == 0) {
@@ -2277,8 +2277,8 @@ gen5_render_copy(struct sna *sna, uint8_t alu,
gen5_get_card_format_for_depth(src->drawable.depth),
op->base.src.width = src->drawable.width;
op->base.src.height = src->drawable.height;
- op->base.src.scale[0] = 1./src->drawable.width;
- op->base.src.scale[1] = 1./src->drawable.height;
+ op->base.src.scale[0] = 1.f/src->drawable.width;
+ op->base.src.scale[1] = 1.f/src->drawable.height;
op->base.src.filter = SAMPLER_FILTER_NEAREST;
op->base.src.repeat = SAMPLER_EXTEND_NONE;
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index eb67fc67..6fb72757 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2498,8 +2498,8 @@ gen6_render_copy(struct sna *sna, uint8_t alu,
gen6_get_card_format_for_depth(src->drawable.depth),
op->base.src.width = src->drawable.width;
op->base.src.height = src->drawable.height;
- op->base.src.scale[0] = 1./src->drawable.width;
- op->base.src.scale[1] = 1./src->drawable.height;
+ op->base.src.scale[0] = 1.f/src->drawable.width;
+ op->base.src.scale[1] = 1.f/src->drawable.height;
op->base.src.filter = SAMPLER_FILTER_NEAREST;
op->base.src.repeat = SAMPLER_EXTEND_NONE;
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 379ff56f..c7906ca2 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2633,8 +2633,8 @@ gen7_render_copy(struct sna *sna, uint8_t alu,
gen7_get_card_format_for_depth(src->drawable.depth),
op->base.src.width = src->drawable.width;
op->base.src.height = src->drawable.height;
- op->base.src.scale[0] = 1./src->drawable.width;
- op->base.src.scale[1] = 1./src->drawable.height;
+ op->base.src.scale[0] = 1.f/src->drawable.width;
+ op->base.src.scale[1] = 1.f/src->drawable.height;
op->base.src.filter = SAMPLER_FILTER_NEAREST;
op->base.src.repeat = SAMPLER_EXTEND_NONE;
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 4a38f390..dc740fc7 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -319,8 +319,8 @@ static struct kgem_bo *upload(struct sna *sna,
if (bo) {
channel->offset[0] -= box->x1;
channel->offset[1] -= box->y1;
- channel->scale[0] = 1./w;
- channel->scale[1] = 1./h;
+ channel->scale[0] = 1.f/w;
+ channel->scale[1] = 1.f/h;
channel->width = w;
channel->height = h;
}
@@ -387,8 +387,8 @@ sna_render_pixmap_bo(struct sna *sna,
channel->height = pixmap->drawable.height;
channel->width = pixmap->drawable.width;
- channel->scale[0] = 1. / pixmap->drawable.width;
- channel->scale[1] = 1. / pixmap->drawable.height;
+ channel->scale[0] = 1.f / pixmap->drawable.width;
+ channel->scale[1] = 1.f / pixmap->drawable.height;
channel->offset[0] = x - dst_x;
channel->offset[1] = y - dst_y;
@@ -648,8 +648,8 @@ static int sna_render_picture_downsample(struct sna *sna,
channel->offset[0] = x - dst_x;
channel->offset[1] = y - dst_y;
- channel->scale[0] = 1./w;
- channel->scale[1] = 1./h;
+ channel->scale[0] = 1.f/w;
+ channel->scale[1] = 1.f/h;
channel->width = w / 2;
channel->height = h / 2;
channel->bo = bo;
@@ -824,8 +824,8 @@ sna_render_picture_extract(struct sna *sna,
channel->offset[0] = x - dst_x;
channel->offset[1] = y - dst_y;
- channel->scale[0] = 1./w;
- channel->scale[1] = 1./h;
+ channel->scale[0] = 1.f/w;
+ channel->scale[1] = 1.f/h;
channel->width = w;
channel->height = h;
channel->bo = bo;
@@ -941,8 +941,8 @@ sna_render_picture_fixup(struct sna *sna,
channel->repeat = RepeatNone;
channel->is_affine = TRUE;
- channel->scale[0] = 1./w;
- channel->scale[1] = 1./h;
+ channel->scale[0] = 1.f/w;
+ channel->scale[1] = 1.f/h;
channel->offset[0] = -dst_x;
channel->offset[1] = -dst_y;
channel->transform = NULL;
@@ -1061,8 +1061,8 @@ sna_render_picture_convert(struct sna *sna,
channel->width = w;
channel->height = h;
- channel->scale[0] = 1. / w;
- channel->scale[1] = 1. / h;
+ channel->scale[0] = 1.f/w;
+ channel->scale[1] = 1.f/h;
channel->offset[0] = x - dst_x - box.x1;
channel->offset[1] = y - dst_y - box.y1;