commit 57e48f023c1b1fbef174b6c0c17394debc066ab1
author Jonas Ådahl <jadahl@gmail.com> Tue Nov 17 16:00:28 2015 +0800
committer Pekka Paalanen <pekka.paalanen@collabora.co.uk> Thu Nov 19 12:58:58 2015 +0200
tree 222da82eba871bc6ce318ab5db1261daa61813fa
parent 496adb3bb3e2b762155aaa80a52b91874ba6b715

Use linux-dmabuf protocol from wayland-protocols

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

src/gl-renderer.c

diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index d7231f4..079cc34 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -41,7 +41,7 @@
 #include "gl-renderer.h"
 #include "vertex-clipping.h"
 #include "linux-dmabuf.h"
-#include "linux-dmabuf-server-protocol.h"
+#include "linux-dmabuf-unstable-v1-server-protocol.h"
 
 #include "shared/helpers.h"
 #include "weston-egl-ext.h"
@@ -1514,7 +1514,7 @@
 	}
 
 	/* reject all flags we do not recognize or handle */
-	if (dmabuf->flags & ~ZLINUX_BUFFER_PARAMS_FLAGS_Y_INVERT)
+	if (dmabuf->flags & ~ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_Y_INVERT)
 		return false;
 
 	image = import_dmabuf(gr, dmabuf);
@@ -1563,7 +1563,7 @@
 	buffer->width = dmabuf->width;
 	buffer->height = dmabuf->height;
 	buffer->y_inverted =
-		!!(dmabuf->flags & ZLINUX_BUFFER_PARAMS_FLAGS_Y_INVERT);
+		!!(dmabuf->flags & ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_Y_INVERT);
 
 	for (i = 0; i < gs->num_images; i++)
 		egl_image_unref(gs->images[i]);