commit 1ddb8dd8f1d31d659ef59c14d5cd9f29ab8c56de
author Murray Calavera <murray.calavera@gmail.com> Tue Mar 15 21:41:14 2016 +0000
committer Pekka Paalanen <pekka.paalanen@collabora.co.uk> Wed Mar 16 11:16:52 2016 +0200
tree 9bde518b49b86278d7769ec99df7ccecf1cdd84a
parent f72df1dfe13de94e4b16f30aa81291da15614202

clients: fix incorrect format handling in simple-shm

the `shm_format` function seems to assume the `wl_shm_format`
enum has bit-exclusive enumerations which is not true.

Signed-off-by: Murray Calavera <murray.calavera@gmail.com>
[Pekka: fix whitespace with an 'if'.]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

clients/simple-shm.c

diff --git a/clients/simple-shm.c b/clients/simple-shm.c
index 6d8f608..1aa26ce 100644
--- a/clients/simple-shm.c
+++ b/clients/simple-shm.c
@@ -50,7 +50,7 @@
 	struct xdg_shell *shell;
 	struct zwp_fullscreen_shell_v1 *fshell;
 	struct wl_shm *shm;
-	uint32_t formats;
+	bool has_xrgb;
 	struct ivi_application *ivi_application;
 };
 
@@ -337,7 +337,8 @@
 {
 	struct display *d = data;
 
-	d->formats |= (1 << format);
+	if (format == WL_SHM_FORMAT_XRGB8888)
+		d->has_xrgb = true;
 }
 
 struct wl_shm_listener shm_listener = {
@@ -414,7 +415,7 @@
 	display->display = wl_display_connect(NULL);
 	assert(display->display);
 
-	display->formats = 0;
+	display->has_xrgb = false;
 	display->registry = wl_display_get_registry(display->display);
 	wl_registry_add_listener(display->registry,
 				 &registry_listener, display);
@@ -466,7 +467,7 @@
 	 * technique.
 	 */
 
-	if (!(display->formats & (1 << WL_SHM_FORMAT_XRGB8888))) {
+	if (!display->has_xrgb) {
 		fprintf(stderr, "WL_SHM_FORMAT_XRGB32 not available\n");
 		exit(1);
 	}