xf86-video-intel: 3 commits - src/sna/sna_accel.c src/sna/sna_trapezoids.c test/basic-string.c test/Makefile.am

[Chris Wilson]

 src/sna/sna_accel.c      |    2 
 src/sna/sna_trapezoids.c |    2 
 test/Makefile.am         |    1 
 test/basic-string.c      |  102 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 105 insertions(+), 2 deletions(-)

New commits:
commit 8eed569fb386a9af48a8beb28666d72c6678e48c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 1 13:02:50 2012 +0100

    sna/trapezoids: Correct extents declaration for fallback
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 0fd1b03..c7f6671 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -4428,7 +4428,7 @@ trapezoid_span_fallback(CARD8 op, PicturePtr src, PicturePtr dst,
 		region.extents.x1 = dst_x + dst->pDrawable->x;
 		region.extents.y1 = dst_y + dst->pDrawable->y;
 		region.extents.x2 = region.extents.x1 + extents.x2;
-		region.extents.y2 = region.extents.y2 + extents.y2;
+		region.extents.y2 = region.extents.y1 + extents.y2;
 		region.data = NULL;
 
 		DBG(("%s: move-to-cpu\n", __FUNCTION__));
commit 91419576eef562378cccf90968c4f0277139b03d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 1 12:09:19 2012 +0100

    sna: Tiny DBG message tweak
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index bdaf0b5..0090639 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -10791,7 +10791,7 @@ static inline bool sna_font_too_large(FontPtr font)
 	int top = max(FONTMAXBOUNDS(font, ascent), FONTASCENT(font));
 	int bot = max(FONTMAXBOUNDS(font, descent), FONTDESCENT(font));
 	int width = max(FONTMAXBOUNDS(font, characterWidth), -FONTMINBOUNDS(font, characterWidth));
-	DBG(("%s: (%d + %d) x %d: %d\n", __FUNCTION__,
+	DBG(("%s? (%d + %d) x %d: %d > 124\n", __FUNCTION__,
 	     top, bot, width, (top + bot) * (width + 7)/8));
 	return (top + bot) * (width + 7)/8 > 124;
 }
commit 4bdecc5b07a184ba136129e75a7fef914ac3b8d2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 1 11:06:04 2012 +0100

    test: Add a very basic test to exercise BLT text drawing
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/Makefile.am b/test/Makefile.am
index 59fae6b..b0e0e13 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,7 @@
 stress_TESTS = \
 	basic-fillrect \
 	basic-rectangle \
+	basic-string \
 	basic-copyarea \
 	basic-copyarea-size \
 	basic-putimage \
diff --git a/test/basic-string.c b/test/basic-string.c
new file mode 100644
index 0000000..9f59c91
--- /dev/null
+++ b/test/basic-string.c
@@ -0,0 +1,102 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <X11/Xutil.h> /* for XDestroyImage */
+
+#include "test.h"
+
+static void draw_string(struct test_display *t, Drawable d, uint8_t alu,
+			int x, int y, uint32_t fg, uint32_t bg, int s, int fill)
+{
+	const char *strings[] = {
+		"Hello",
+		"World",
+		"Cairo's twin is Giza",
+	};
+	XGCValues val;
+	GC gc;
+
+	val.function = alu;
+	val.foreground = fg;
+	val.background = bg;
+
+	gc = XCreateGC(t->dpy, d, GCForeground | GCBackground | GCFunction, &val);
+	if (fill)
+		XDrawImageString(t->dpy, d, gc, x, y, strings[s%3], strlen(strings[s%3]));
+	else
+		XDrawString(t->dpy, d, gc, x, y, strings[s%3], strlen(strings[s%3]));
+	XFreeGC(t->dpy, gc);
+}
+
+static void clear(struct test_display *dpy, struct test_target *tt)
+{
+	XRenderColor render_color = {0};
+	XRenderFillRectangle(dpy->dpy, PictOpClear, tt->picture, &render_color,
+			     0, 0, tt->width, tt->height);
+}
+
+static void string_tests(struct test *t, int reps, int sets, enum target target)
+{
+	struct test_target real, ref;
+	int r, s;
+
+	printf("Testing general (%s): ", test_target_name(target));
+	fflush(stdout);
+
+	test_target_create_render(&t->real, target, &real);
+	clear(&t->real, &real);
+
+	test_target_create_render(&t->ref, target, &ref);
+	clear(&t->ref, &ref);
+
+	for (s = 0; s < sets; s++) {
+		for (r = 0; r < reps; r++) {
+			int x = rand() % (2*real.width) - real.width;
+			int y = rand() % (2*real.height) - real.height;
+			uint8_t alu = rand() % (GXset + 1);
+			uint32_t fg = rand();
+			uint32_t bg = rand();
+			int str = rand();
+			int fill = rand() & 1;
+
+			draw_string(&t->real, real.draw, alu, x, y, fg, bg, str, fill);
+			draw_string(&t->ref, ref.draw, alu, x, y, fg, bg, str, fill);
+		}
+
+		test_compare(t,
+			     real.draw, real.format,
+			     ref.draw, ref.format,
+			     0, 0, real.width, real.height,
+			     "");
+	}
+
+	printf("passed [%d iterations x %d]\n", reps, sets);
+
+	test_target_destroy_render(&t->real, &real);
+	test_target_destroy_render(&t->ref, &ref);
+}
+
+int main(int argc, char **argv)
+{
+	struct test test;
+	int i;
+
+	test_init(&test, argc, argv);
+
+	for (i = 0; i <= DEFAULT_ITERATIONS; i++) {
+		int reps = 1 << i;
+		int sets = 1 << (12 - i);
+		enum target t;
+
+		if (sets < 2)
+			sets = 2;
+
+		for (t = TARGET_FIRST; t <= TARGET_LAST; t++) {
+			string_tests(&test, reps, sets, t);
+		}
+	}
+
+	return 0;
+}