blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #880 from emersion/advertize-renderer-formats 

Advertize supported renderer formats
This commit is contained in:
Drew DeVault 2018-04-21 14:45:09 +02:00 committed by GitHub
parent 5e16bc96b1 70d820be25
commit b116414bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/render/wlr_renderer.h
View File

@ -92,6 +92,8 @@ bool wlr_renderer_read_pixels(struct wlr_renderer *r, enum wl_shm_format fmt,
*/
bool wlr_renderer_format_supported(struct wlr_renderer *r,
enum wl_shm_format fmt);
void wlr_renderer_init_wl_shm(struct wlr_renderer *r,
struct wl_display *display);
/**
* Destroys this wlr_renderer. Textures must be destroyed separately.
*/

20
render/wlr_renderer.c
View File

@ -4,6 +4,7 @@
#include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_matrix.h>
#include <wlr/util/log.h>
void wlr_renderer_init(struct wlr_renderer *renderer,
const struct wlr_renderer_impl *impl) {
@ -151,3 +152,22 @@ bool wlr_renderer_format_supported(struct wlr_renderer *r,
enum wl_shm_format fmt) {
return r->impl->format_supported(r, fmt);
}
void wlr_renderer_init_wl_shm(struct wlr_renderer *r,
struct wl_display *display) {
if (wl_display_init_shm(display)) {
wlr_log(L_ERROR, "Failed to initialize shm");
return;
}
size_t len;
const enum wl_shm_format *formats = wlr_renderer_get_formats(r, &len);
if (formats == NULL) {
wlr_log(L_ERROR, "Failed to initialize shm: cannot get formats");
return;
}
for (size_t i = 0; i < len; ++i) {
wl_display_add_shm_format(display, formats[i]);
}
}

2
rootston/main.c
View File

@ -43,7 +43,7 @@ int main(int argc, char **argv) {
assert(server.renderer);
server.data_device_manager =
wlr_data_device_manager_create(server.wl_display);
wl_display_init_shm(server.wl_display);
wlr_renderer_init_wl_shm(server.renderer, server.wl_display);
server.desktop = desktop_create(&server, server.config);
server.input = input_create(&server, server.config);