[Mesa-dev] [PATCH] Revert "st/egl: Update to the new wl_shm_pool interface"

[Sven Joachim]

This reverts commit 9ba3cecaa02eba07bc6456c441126e4e2e823da5.

The wl_shm_pool interface requires wayland from git master and is not
present in the wayland 0.85 branch.
---
 src/gallium/state_trackers/egl/wayland/native_shm.c |   11 +++--------
 src/gallium/winsys/sw/wayland/wayland_sw_winsys.c   |    1 -
 src/gallium/winsys/sw/wayland/wayland_sw_winsys.h   |    1 -
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c b/src/gallium/state_trackers/egl/wayland/native_shm.c
index 574ffce..c237578 100644
--- a/src/gallium/state_trackers/egl/wayland/native_shm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_shm.c
@@ -84,8 +84,6 @@ wayland_create_shm_buffer(struct wayland_display *display,
    struct winsys_handle wsh;
    uint width, height;
    enum wl_shm_format format;
-   struct wl_buffer *buffer;
-   struct wl_shm_pool *pool;
 
    resource = resource_surface_get_single_resource(surface->rsurf, attachment);
    resource_surface_get_size(surface->rsurf, &width, &height);
@@ -106,12 +104,9 @@ wayland_create_shm_buffer(struct wayland_display *display,
       break;
    }
 
-   pool = wl_shm_create_pool(shmdpy->wl_shm, wsh.fd, wsh.size);
-   buffer = wl_shm_pool_create_buffer(pool, 0, width, height,
-                                      wsh.stride, format);
-   wl_shm_pool_destroy(pool);
-
-   return buffer;
+   return wl_shm_create_buffer(shmdpy->wl_shm, wsh.fd,
+                               width, height,
+                               wsh.stride, format);
 }
 
 static void
diff --git a/src/gallium/winsys/sw/wayland/wayland_sw_winsys.c b/src/gallium/winsys/sw/wayland/wayland_sw_winsys.c
index 331900e..1a31ada 100644
--- a/src/gallium/winsys/sw/wayland/wayland_sw_winsys.c
+++ b/src/gallium/winsys/sw/wayland/wayland_sw_winsys.c
@@ -243,7 +243,6 @@ wayland_displaytarget_get_handle(struct sw_winsys *ws,
 
    whandle->fd = wldt->fd;
    whandle->stride = wldt->stride;
-   whandle->size = wldt->size;
 
    return TRUE;
 }
diff --git a/src/gallium/winsys/sw/wayland/wayland_sw_winsys.h b/src/gallium/winsys/sw/wayland/wayland_sw_winsys.h
index c7a0b5c..bedd240 100644
--- a/src/gallium/winsys/sw/wayland/wayland_sw_winsys.h
+++ b/src/gallium/winsys/sw/wayland/wayland_sw_winsys.h
@@ -32,7 +32,6 @@ struct wl_display;
 struct winsys_handle {
    int fd;
    unsigned stride;
-   unsigned size;
 };
 
 struct sw_winsys *
-- 
1.7.10