summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2004-09-20 02:42:53 +0000
committerEric Anholt <anholt@freebsd.org>2004-09-20 02:42:53 +0000
commit1550c69e3528653a0690f116a454a77f63bf1294 (patch)
tree6e94b3353221e4c7d19195152d65c5f4a5c50365
parente342db6763ad3f829d1bfc14663247509677f20b (diff)
Back out previous changes to the transformed coordinates test. It looks like theRENDERCHECK-1_0_2
intention really was for pixels to be centered on (x + .5, y + .5), and this does seem more sensible. Bump the version to 1.0.2 and update docs.
-rw-r--r--AUTHORS2
-rw-r--r--NEWS12
-rw-r--r--README1
-rw-r--r--TODO4
-rw-r--r--configure.ac2
-rw-r--r--tests.c28
6 files changed, 27 insertions, 22 deletions
diff --git a/AUTHORS b/AUTHORS
index f43375f..aba7a62 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-Written in 2004 by Eric Anholt. \ No newline at end of file
+Written in 2004 by Eric Anholt.
diff --git a/NEWS b/NEWS
index 0c03412..5743246 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,10 @@
-9 May 2004:
-First release of renderext.
+2004-09-19:
+ Version 1.0.2 released.
+ Adds a transformed coordinates test.
+
+2004-05-17:
+ Version 1.0.1 released.
+ Makes the fill test useful and adds a destination coordinates test.
+
+2004-05-10:
+ Initial version 1.0 imported.
diff --git a/README b/README
index 9034754..26f4a90 100644
--- a/README
+++ b/README
@@ -4,6 +4,7 @@ separate calculations of expected output.
Tests currently include:
- Destination coordinates correctness
- Source coordinates correctness
+- Transformed (FilterNearest) source coordinates correctness.
- Composite with and without mask (with/without component alpha), with 1x1
repeating Pictures and 10x10 Pictures.
diff --git a/TODO b/TODO
index 158f883..bfae01f 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-- Check filtering
+- Check bilinear filtering
- Check repeating transformed sources
- Check coordinates for more different transformations
- Get a useful number being produced for error values, and correct eval_diff's
@@ -6,4 +6,4 @@
- Check source/mask pixels falling outside the drawable.
- Command line args for verbosity, what tests, move iter, etc.
- Check repeating of sources with various sizes.
-- Check trapezoids! \ No newline at end of file
+- Check trapezoids!
diff --git a/configure.ac b/configure.ac
index 69b5abd..510b31b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([rendercheck],
- 1.0.1,
+ 1.0.2,
[anholt@FreeBSD.org],
rendercheck)
diff --git a/tests.c b/tests.c
index 048428d..0123b63 100644
--- a/tests.c
+++ b/tests.c
@@ -321,7 +321,7 @@ trans_coords_test(Display *dpy, picture_info *win, picture_info *src,
int x, y;
XRenderPictureAttributes pa;
Bool failed = FALSE;
- int tested_colors[35][35], expected_colors[35][35];
+ int tested_colors[40][40], expected_colors[40][40];
XTransform t;
t.matrix[0][0] = 1.0; t.matrix[0][1] = 0.0; t.matrix[0][2] = 0.0;
@@ -331,22 +331,18 @@ trans_coords_test(Display *dpy, picture_info *win, picture_info *src,
if (!test_mask)
XRenderComposite(dpy, PictOpSrc, src->pict, 0,
- win->pict, 0, 0, 0, 0, 0, 0, 35, 35);
+ win->pict, 0, 0, 0, 0, 0, 0, 40, 40);
else {
XRenderComposite(dpy, PictOpSrc, white->pict, src->pict,
- win->pict, 0, 0, 0, 0, 0, 0, 35, 35);
+ win->pict, 0, 0, 0, 0, 0, 0, 40, 40);
}
- /* Only pay attention to the first 35 pixels, as we aren't expecting
- * errors beyond that, and then we don't hit rounding-out-of-bounds
- * issues on our expected source coords.
- */
- for (x = 0; x < 35; x++) {
- for (y = 0; y < 35; y++) {
+ for (x = 0; x < 40; x++) {
+ for (y = 0; y < 40; y++) {
int src_sample_x, src_sample_y;
- src_sample_x = (x + 4) / 8;
- src_sample_y = (y + 4) / 8;
+ src_sample_x = x / 8;
+ src_sample_y = y / 8;
expected_colors[x][y] = dot_colors[src_sample_x][src_sample_y];
get_pixel(dpy, win, x, y, &tested);
@@ -368,17 +364,17 @@ trans_coords_test(Display *dpy, picture_info *win, picture_info *src,
printf("%s transform coordinates test failed.\n",
test_mask ? "mask" : "src");
printf("expected vs tested:\n");
- for (y = 0; y < 35; y++) {
- for (x = 0; x < 35; x++)
+ for (y = 0; y < 40; y++) {
+ for (x = 0; x < 40; x++)
printf("%d", expected_colors[x][y]);
printf(" ");
- for (x = 0; x < 35; x++)
+ for (x = 0; x < 40; x++)
printf("%d", tested_colors[x][y]);
printf("\n");
}
printf(" vs tested (same)\n");
- for (y = 0; y < 35; y++) {
- for (x = 0; x < 35; x++)
+ for (y = 0; y < 40; y++) {
+ for (x = 0; x < 40; x++)
printf("%d", tested_colors[x][y]);
printf("\n");
}