[PATCH weston 01/10] compositor-wayland: Convert use-pixman flag to boolean

Armin Krezović krezovic.armin at gmail.com
Sun Oct 9 15:30:22 UTC 2016


Signed-off-by: Armin Krezović <krezovic.armin at gmail.com>
---
 compositor/main.c              | 2 +-
 libweston/compositor-wayland.c | 6 +++---
 libweston/compositor-wayland.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compositor/main.c b/compositor/main.c
index fca9778..d081106 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -1579,7 +1579,7 @@ load_wayland_backend(struct weston_compositor *c,
 	config.display_name = NULL;
 	config.fullscreen = 0;
 	config.sprawl = 0;
-	config.use_pixman = 0;
+	config.use_pixman = false;
 
 	const struct weston_option wayland_options[] = {
 		{ WESTON_OPTION_INTEGER, "width", 0, &parsed_options->width },
diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index 46fdde1..d1ff8d7 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -75,7 +75,7 @@ struct wayland_backend {
 		uint32_t event_mask;
 	} parent;
 
-	int use_pixman;
+	bool use_pixman;
 	int sprawl_across_outputs;
 	int fullscreen;
 
@@ -2345,7 +2345,7 @@ wayland_backend_create(struct weston_compositor *compositor,
 		gl_renderer = weston_load_module("gl-renderer.so",
 						 "gl_renderer_interface");
 		if (!gl_renderer)
-			b->use_pixman = 1;
+			b->use_pixman = true;
 	}
 
 	if (!b->use_pixman) {
@@ -2357,7 +2357,7 @@ wayland_backend_create(struct weston_compositor *compositor,
 					0) < 0) {
 			weston_log("Failed to initialize the GL renderer; "
 				   "falling back to pixman.\n");
-			b->use_pixman = 1;
+			b->use_pixman = true;
 		}
 	}
 
diff --git a/libweston/compositor-wayland.h b/libweston/compositor-wayland.h
index 58e0fb1..9a9dde8 100644
--- a/libweston/compositor-wayland.h
+++ b/libweston/compositor-wayland.h
@@ -38,7 +38,7 @@ extern "C" {
 
 struct weston_wayland_backend_config {
 	struct weston_backend_config base;
-	int use_pixman;
+	bool use_pixman;
 	int sprawl;
 	char *display_name;
 	int fullscreen;
-- 
2.10.1



More information about the wayland-devel mailing list