From e5f5c2729a1be1f3b814509308a15aef6901d2d3 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sun, 22 Jan 2012 13:51:23 +0100 Subject: font: require compositor reference To avoid cairo dependencies we now take a compositor reference in the font backend so fonts can be drawn with GL textures instead of cairo. Signed-off-by: David Herrmann --- tests/test_console.c | 6 +++--- tests/test_terminal.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/test_console.c b/tests/test_console.c index d243644..536a50b 100644 --- a/tests/test_console.c +++ b/tests/test_console.c @@ -274,15 +274,15 @@ static int setup_eloop(struct console *con) if (ret) goto err_loop; - ret = kmscon_font_factory_new(&con->ff, con->st); + ret = kmscon_compositor_new(&con->comp); if (ret) goto err_loop; - ret = kmscon_compositor_new(&con->comp); + ret = kmscon_compositor_use(con->comp); if (ret) goto err_loop; - ret = kmscon_compositor_use(con->comp); + ret = kmscon_font_factory_new(&con->ff, con->st, con->comp); if (ret) goto err_loop; diff --git a/tests/test_terminal.c b/tests/test_terminal.c index 969f1ec..ae4cc39 100644 --- a/tests/test_terminal.c +++ b/tests/test_terminal.c @@ -158,15 +158,15 @@ static int setup_app(struct app *app) if (ret) goto err_loop; - ret = kmscon_font_factory_new(&app->ff, app->st); + ret = kmscon_compositor_new(&app->comp); if (ret) goto err_loop; - ret = kmscon_compositor_new(&app->comp); + ret = kmscon_compositor_use(app->comp); if (ret) goto err_loop; - ret = kmscon_compositor_use(app->comp); + ret = kmscon_font_factory_new(&app->ff, app->st, app->comp); if (ret) goto err_loop; -- cgit v1.2.3