diff options
| author | Simon Ser <contact@emersion.fr> | 2021-02-23 17:36:32 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-02-23 17:36:32 +0100 |
| commit | 675bc396583f2e1e30ce2a5a91769cc58be9948a (patch) | |
| tree | 49b16b780bfe1da70d9504bd05291312e55cade8 | |
| parent | c2815fd44de5d74e379c118b4ccded5a9419e32c (diff) | |
Fix wl_shm_format passed to wlr_texture_from_pixels
Fixes: 27fba3df4347 ("render: use DRM formats in wlr_texture_from_pixels")
| -rw-r--r-- | examples/output-layout.c | 3 | ||||
| -rw-r--r-- | examples/rotation.c | 3 | ||||
| -rw-r--r-- | examples/touch.c | 3 | ||||
| -rw-r--r-- | types/wlr_output.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/examples/output-layout.c b/examples/output-layout.c index 0c86abcc..cacee014 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -1,4 +1,5 @@ #define _POSIX_C_SOURCE 200112L +#include <drm_fourcc.h> #include <GLES2/gl2.h> #include <limits.h> #include <math.h> @@ -279,7 +280,7 @@ int main(int argc, char *argv[]) { state.renderer = wlr_backend_get_renderer(wlr); state.cat_texture = wlr_texture_from_pixels(state.renderer, - WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, + DRM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, cat_tex.pixel_data); if (!wlr_backend_start(wlr)) { diff --git a/examples/rotation.c b/examples/rotation.c index 4eb600d9..17bb4384 100644 --- a/examples/rotation.c +++ b/examples/rotation.c @@ -1,4 +1,5 @@ #define _POSIX_C_SOURCE 200112L +#include <drm_fourcc.h> #include <GLES2/gl2.h> #include <getopt.h> #include <math.h> @@ -259,7 +260,7 @@ int main(int argc, char *argv[]) { exit(EXIT_FAILURE); } state.cat_texture = wlr_texture_from_pixels(state.renderer, - WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, + DRM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, cat_tex.pixel_data); if (!state.cat_texture) { wlr_log(WLR_ERROR, "Could not start compositor, OOM"); diff --git a/examples/touch.c b/examples/touch.c index c0053075..3184d8be 100644 --- a/examples/touch.c +++ b/examples/touch.c @@ -1,4 +1,5 @@ #define _POSIX_C_SOURCE 200112L +#include <drm_fourcc.h> #include <GLES2/gl2.h> #include <math.h> #include <stdint.h> @@ -267,7 +268,7 @@ int main(int argc, char *argv[]) { exit(EXIT_FAILURE); } state.cat_texture = wlr_texture_from_pixels(state.renderer, - WL_SHM_FORMAT_ARGB8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, + DRM_FORMAT_ARGB8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, cat_tex.pixel_data); if (!state.cat_texture) { wlr_log(WLR_ERROR, "Could not start compositor, OOM"); diff --git a/types/wlr_output.c b/types/wlr_output.c index eb55fecc..1ce3a199 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -1044,7 +1044,7 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor, cursor->enabled = false; if (pixels != NULL) { cursor->texture = wlr_texture_from_pixels(renderer, - WL_SHM_FORMAT_ARGB8888, stride, width, height, pixels); + DRM_FORMAT_ARGB8888, stride, width, height, pixels); if (cursor->texture == NULL) { return false; } |