diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-01-29 17:13:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 17:13:23 -0500 |
| commit | ed5b1fdedd775a7acec3d6814cc2ac007e34fd29 (patch) | |
| tree | 79192b14d83eae55d63c38223ba60beb020bb6f6 /rootston | |
| parent | 60b2d969e07e24ed1b96ccc9d82bc2f9c1d540f2 (diff) | |
| parent | f34a1b75ebd9dbebf4fb9c2cf34d878fce902c03 (diff) | |
Merge pull request #580 from emersion/screenshooter-renderer-backport
Backport screenshooter fixes from the renderer redesign v1
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/desktop.c | 3 | ||||
| -rw-r--r-- | rootston/main.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 44bdf365..435e9426 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -551,8 +551,7 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->gamma_control_manager = wlr_gamma_control_manager_create( server->wl_display); - desktop->screenshooter = wlr_screenshooter_create(server->wl_display, - server->renderer); + desktop->screenshooter = wlr_screenshooter_create(server->wl_display); desktop->server_decoration_manager = wlr_server_decoration_manager_create(server->wl_display); wlr_server_decoration_manager_set_default_mode( diff --git a/rootston/main.c b/rootston/main.c index a327576a..3273c53f 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -8,7 +8,6 @@ #include <wlr/backend/headless.h> #include <wlr/backend/multi.h> #include <wlr/render.h> -#include <wlr/render/gles2.h> #include <wlr/util/log.h> #include "rootston/config.h" #include "rootston/server.h" @@ -34,13 +33,12 @@ int main(int argc, char **argv) { assert(server.wl_event_loop = wl_display_get_event_loop(server.wl_display)); server.backend = wlr_backend_autocreate(server.wl_display); - if (server.backend == NULL) { wlr_log(L_ERROR, "could not start backend"); return 1; } - assert(server.renderer = wlr_gles2_renderer_create(server.backend)); + assert(server.renderer = wlr_backend_get_renderer(server.backend)); server.data_device_manager = wlr_data_device_manager_create(server.wl_display); wl_display_init_shm(server.wl_display); |