nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 07:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wl_shm_format passed to wlr_texture_from_pixels

Browse Source 
Fixes: 27fba3df43 ("render: use DRM formats in wlr_texture_from_pixels")
This commit is contained in:
Simon Ser 2021-02-23 17:36:32 +01:00
parent c2815fd44d
commit 675bc39658
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/output-layout.c
View File

@ -1,4 +1,5 @@
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 200112L
#include <drm_fourcc.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
@ -279,7 +280,7 @@ int main(int argc, char *argv[]) {
state.renderer = wlr_backend_get_renderer(wlr); state.renderer = wlr_backend_get_renderer(wlr);
state.cat_texture = wlr_texture_from_pixels(state.renderer, 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); cat_tex.pixel_data);
if (!wlr_backend_start(wlr)) { if (!wlr_backend_start(wlr)) {

3
examples/rotation.c
View File

@ -1,4 +1,5 @@
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 200112L
#include <drm_fourcc.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <getopt.h> #include <getopt.h>
#include <math.h> #include <math.h>
@ -259,7 +260,7 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
state.cat_texture = wlr_texture_from_pixels(state.renderer, 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); cat_tex.pixel_data);
if (!state.cat_texture) { if (!state.cat_texture) {
wlr_log(WLR_ERROR, "Could not start compositor, OOM"); wlr_log(WLR_ERROR, "Could not start compositor, OOM");

3
examples/touch.c
View File

@ -1,4 +1,5 @@
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 200112L
#include <drm_fourcc.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>
@ -267,7 +268,7 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
state.cat_texture = wlr_texture_from_pixels(state.renderer, 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); cat_tex.pixel_data);
if (!state.cat_texture) { if (!state.cat_texture) {
wlr_log(WLR_ERROR, "Could not start compositor, OOM"); wlr_log(WLR_ERROR, "Could not start compositor, OOM");

2
types/wlr_output.c
View File

@ -1044,7 +1044,7 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
cursor->enabled = false; cursor->enabled = false;
if (pixels != NULL) { if (pixels != NULL) {
cursor->texture = wlr_texture_from_pixels(renderer, 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) { if (cursor->texture == NULL) {
return false; return false;
} }