lib/igt_fb: setup font in igt_get_cairo_ctx

We always want the same boring one, so extract it.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 4289b50..60b582f 100644 (file)
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -382,7 +382,10 @@ cairo_t *igt_get_cairo_ctx(int fd, struct igt_fb *fb)
        surface = get_cairo_surface(fd, fb);
        cr = cairo_create(surface);
        cairo_surface_destroy(surface);
+       igt_assert(cairo_status(cr) == CAIRO_STATUS_SUCCESS);
 
+       cairo_select_font_face(cr, "Helvetica", CAIRO_FONT_SLANT_NORMAL,
+                              CAIRO_FONT_WEIGHT_NORMAL);
        igt_assert(cairo_status(cr) == CAIRO_STATUS_SUCCESS);
 
        return cr;

diff --git a/tests/kms_render.c b/tests/kms_render.c
index d392814..c4a6abb 100644 (file)
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -60,8 +60,6 @@ static int paint_fb(struct igt_fb *fb, const char *test_name,
        igt_paint_color_gradient(cr, 0, 0, fb->width, fb->height, 1, 1, 1);
        igt_paint_test_pattern(cr, fb->width, fb->height);
 
-       cairo_select_font_face(cr, "Helvetica", CAIRO_FONT_SLANT_NORMAL,
-                              CAIRO_FONT_WEIGHT_NORMAL);
        cairo_move_to(cr, fb->width / 2, fb->height / 2);
        cairo_set_font_size(cr, 36);
        igt_cairo_printf_line(cr, align_hcenter, 10, "%s", test_name);

diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index 802876a..270d1a3 100644 (file)
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -152,8 +152,6 @@ static int paint_fb(struct igt_fb *fb, const char *test_name,
 
        igt_paint_test_pattern(cr, fb->width, fb->height);
 
-       cairo_select_font_face(cr, "Helvetica", CAIRO_FONT_SLANT_NORMAL,
-                              CAIRO_FONT_WEIGHT_NORMAL);
        cairo_move_to(cr, fb->width / 2, fb->height / 2);
        cairo_set_font_size(cr, 24);
        igt_cairo_printf_line(cr, align_hcenter, 40, "%s", test_name);

diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index c320a9c..2b0233e 100644 (file)
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -284,9 +284,6 @@ static void paint_output_info(struct connector *c, struct igt_fb *fb)
 
        igt_paint_test_pattern(cr, l_width, l_height);
 
-       cairo_select_font_face(cr, "Helvetica",
-                              CAIRO_FONT_SLANT_NORMAL,
-                              CAIRO_FONT_WEIGHT_NORMAL);
        cairo_move_to(cr, l_width / 2, l_height / 2);
 
        /* Print connector and mode name */