fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-06 11:28:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

simple-dmabuf-drm: use opt bitmask instead of is_immediate

Browse source 
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Guido Günther 2018-03-16 18:56:49 +01:00 • committed by Pekka Paalanen
parent a4e206e170
commit 2e24198974
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clients/simple-dmabuf-drm.c
View file

@ -62,6 +62,7 @@ struct buffer;
/* Possible options that affect the displayed image */
#define OPT_Y_INVERTED 1 /* contents has y axis inverted */
#define OPT_IMMEDIATE 2 /* create wl_buffer immediately */
struct display {
@ -756,7 +757,7 @@ static const struct wl_registry_listener registry_listener = {
};
static struct display *
create_display(int is_immediate, int format)
create_display(int opts, int format)
{
struct display *display;
const char *extensions;
@ -769,7 +770,7 @@ create_display(int is_immediate, int format)
display->display = wl_display_connect(NULL);
assert(display->display);
display->req_dmabuf_immediate = is_immediate;
display->req_dmabuf_immediate = opts & OPT_IMMEDIATE;
display->req_dmabuf_modifiers = (format == DRM_FORMAT_NV12);
/*
@ -874,7 +875,6 @@ main(int argc, char **argv)
struct sigaction sigint;
struct display *display;
struct window *window;
int is_immediate = 0;
int opts = 0;
int import_format = DRM_FORMAT_XRGB8888;
int ret = 0, i = 0;
@ -886,8 +886,8 @@ main(int argc, char **argv)
for (i = 1; i < argc; i++) {
if (!strncmp(argv[i], import_mode,
sizeof(import_mode) - 1)) {
is_immediate = is_true(argv[i]
+ sizeof(import_mode) - 1);
if (is_true(argv[i] + sizeof(import_mode) - 1))
opts |= OPT_IMMEDIATE;
}
else if (!strncmp(argv[i], format, sizeof(format) - 1)) {
import_format = parse_import_format(argv[i]
@ -904,7 +904,7 @@ main(int argc, char **argv)
}
}
display = create_display(is_immediate, import_format);
display = create_display(opts, import_format);
window = create_window(display, 256, 256, import_format, opts);
if (!window)
return 1;