diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2012-01-22 13:51:23 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@googlemail.com> | 2012-01-22 13:51:23 +0100 |
| commit | e5f5c2729a1be1f3b814509308a15aef6901d2d3 (patch) | |
| tree | 0b177d929deed8822d57c1051ddc54a2814b4ca3 /tests | |
| parent | 0f6c75637ff7abe4f699587ff6eee4f4bacdbd2a (diff) | |
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 <dh.herrmann@googlemail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_console.c | 6 | ||||
| -rw-r--r-- | tests/test_terminal.c | 6 |
2 files changed, 6 insertions, 6 deletions
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; |