diff options
author | Simon Ser <contact@emersion.fr> | 2021-02-23 17:41:15 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2021-02-23 17:42:04 +0100 |
commit | 66343839b146a54505b746784cd42a8efb844963 (patch) | |
tree | 3d591c499d37e17489819295225547821a80239b /sway/tree | |
parent | grimshot: document support for piping to STDOUT. (diff) | |
download | sway-66343839b146a54505b746784cd42a8efb844963.tar.gz sway-66343839b146a54505b746784cd42a8efb844963.tar.zst sway-66343839b146a54505b746784cd42a8efb844963.zip |
Fix wl_shm_format passed to wlr_texture_from_pixels
See https://github.com/swaywm/wlroots/pull/2744
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/container.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 79c23274..6b4c6de2 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #define _POSIX_C_SOURCE 200809L | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #include <assert.h> | 2 | #include <assert.h> |
3 | #include <drm_fourcc.h> | ||
3 | #include <stdint.h> | 4 | #include <stdint.h> |
4 | #include <stdlib.h> | 5 | #include <stdlib.h> |
5 | #include <string.h> | 6 | #include <string.h> |
@@ -508,7 +509,7 @@ static void update_title_texture(struct sway_container *con, | |||
508 | struct wlr_renderer *renderer = wlr_backend_get_renderer( | 509 | struct wlr_renderer *renderer = wlr_backend_get_renderer( |
509 | output->wlr_output->backend); | 510 | output->wlr_output->backend); |
510 | *texture = wlr_texture_from_pixels( | 511 | *texture = wlr_texture_from_pixels( |
511 | renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data); | 512 | renderer, DRM_FORMAT_ARGB8888, stride, width, height, data); |
512 | cairo_surface_destroy(surface); | 513 | cairo_surface_destroy(surface); |
513 | g_object_unref(pango); | 514 | g_object_unref(pango); |
514 | cairo_destroy(cairo); | 515 | cairo_destroy(cairo); |
@@ -1594,7 +1595,7 @@ static void update_marks_texture(struct sway_container *con, | |||
1594 | struct wlr_renderer *renderer = wlr_backend_get_renderer( | 1595 | struct wlr_renderer *renderer = wlr_backend_get_renderer( |
1595 | output->wlr_output->backend); | 1596 | output->wlr_output->backend); |
1596 | *texture = wlr_texture_from_pixels( | 1597 | *texture = wlr_texture_from_pixels( |
1597 | renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data); | 1598 | renderer, DRM_FORMAT_ARGB8888, stride, width, height, data); |
1598 | cairo_surface_destroy(surface); | 1599 | cairo_surface_destroy(surface); |
1599 | g_object_unref(pango); | 1600 | g_object_unref(pango); |
1600 | cairo_destroy(cairo); | 1601 | cairo_destroy(cairo); |