mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

shm: add create() function without a wlr_renderer

Browse source 
This allows compositors which don't use wlr_renderer to still use
wlroots' wl_shm implementation.
This commit is contained in:
Simon Ser 2022-11-24 09:54:51 +01:00 • committed by Simon Zeni
parent 3ed69b4946
commit 76b3687739
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/wlr/types/wlr_shm.h
View file

@ -24,6 +24,17 @@ struct wlr_shm;
/** /**
* Create the wl_shm global. * Create the wl_shm global.
*
* Compositors using struct wlr_renderer should use wlr_shm_create_with_renderer()
* instead.
*/
struct wlr_shm *wlr_shm_create(struct wl_display *display, uint32_t version,
const uint32_t *formats, size_t formats_len);
/**
* Create the wl_shm global.
*
* The pixel formats advertised to clients are taken from the struct wlr_renderer.
*/ */
struct wlr_shm *wlr_shm_create_with_renderer(struct wl_display *display, struct wlr_shm *wlr_shm_create_with_renderer(struct wl_display *display,
uint32_t version, struct wlr_renderer *renderer); uint32_t version, struct wlr_renderer *renderer);

6
types/wlr_shm.c
View file

@ -495,8 +495,8 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
free(shm); free(shm);
} }
static struct wlr_shm *shm_create(struct wl_display *display, struct wlr_shm *wlr_shm_create(struct wl_display *display, uint32_t version,
uint32_t version, const uint32_t *formats, size_t formats_len) { const uint32_t *formats, size_t formats_len) {
// ARGB8888 and XRGB8888 must be supported per the wl_shm spec // ARGB8888 and XRGB8888 must be supported per the wl_shm spec
bool has_argb8888 = false, has_xrgb8888 = false; bool has_argb8888 = false, has_xrgb8888 = false;
for (size_t i = 0; i < formats_len; i++) { for (size_t i = 0; i < formats_len; i++) {
@ -556,7 +556,7 @@ struct wlr_shm *wlr_shm_create_with_renderer(struct wl_display *display,
return NULL; return NULL;
} }
return shm_create(display, version, formats, formats_len); return wlr_shm_create(display, version, formats, formats_len);
} }
static bool shm_has_format(struct wlr_shm *shm, uint32_t shm_format) { static bool shm_has_format(struct wlr_shm *shm, uint32_t shm_format) {