mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #580 from emersion/screenshooter-renderer-backport

Browse source 
Backport screenshooter fixes from the renderer redesign v1
This commit is contained in:
Tony Crisci 2018-01-29 17:13:23 -05:00 • committed by GitHub
commit ed5b1fdedd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 182 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rootston/desktop.c
View file

@ -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(

4
rootston/main.c
View file

@ -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);