Add QWayland::shm object to client

Allows more flexibility for the client to determine
additional shm formats supported by the compositor in
addition to the standard types. For example YUV formats.

Change-Id: Ib4a47c1d5bbeed9314d5ad5f5f8e1551c1dd71e4
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Reviewed-by: Mikko Levonmaa <mikko.levonmaa@bitfactor.fi>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index 96d79ddbd..84e94a61d 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -45,6 +45,7 @@
 #include <QtWaylandClient/private/qwayland-wayland.h>
 #include <QtWaylandClient/private/qwaylandclientexport_p.h>
 #include <QtWaylandClient/private/qwayland-xdg-shell.h>
+#include <QtWaylandClient/private/qwaylandshm_p.h>
 
 struct wl_cursor_image;
 
@@ -147,7 +148,7 @@ public:
      * to enable many listeners at once. */
     void addRegistryListener(RegistryListener listener, void *data);
 
-    struct wl_shm *shm() const { return mShm; }
+    QWaylandShm *shm() const { return mShm.data(); }
 
     static uint32_t currentTimeMillisec();
 
@@ -176,7 +177,7 @@ private:
     struct wl_display *mDisplay;
     struct wl_event_queue *mEventQueue;
     QtWayland::wl_compositor mCompositor;
-    struct wl_shm *mShm;
+    QScopedPointer<QWaylandShm> mShm;
     QThread *mEventThread;
     QWaylandEventThread *mEventThreadObject;
     QScopedPointer<QtWayland::wl_shell> mShell;