diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2012-04-06 13:35:43 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-04-10 18:54:33 +0200 |
| commit | a72e662b4e5c45988bbe06d587e167901b5606da (patch) | |
| tree | 74f4aa9e6338ac62b90403bcd914065d8f08a8b0 /tests/auto/compositor/mockclient.cpp | |
| parent | 585a1080cc755c0c7820a06ecfd059f75af60bfd (diff) | |
Update wayland_sha1 and implement buffer_pool interface
Change-Id: I0628a7655a6deb061a5d0b6c6304c89d8655cf11
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests/auto/compositor/mockclient.cpp')
| -rw-r--r-- | tests/auto/compositor/mockclient.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/mockclient.cpp index 5dabfcd57..4b04164b6 100644 --- a/tests/auto/compositor/mockclient.cpp +++ b/tests/auto/compositor/mockclient.cpp @@ -167,7 +167,8 @@ ShmBuffer::ShmBuffer(const QSize &size, wl_shm *shm) } image = QImage(static_cast<uchar *>(data), size.width(), size.height(), stride, QImage::Format_ARGB32_Premultiplied); - handle = wl_shm_create_buffer(shm,fd, size.width(), size.height(), + shm_pool = wl_shm_create_pool(shm,fd,alloc); + handle = wl_shm_pool_create_buffer(shm_pool,0, size.width(), size.height(), stride, WL_SHM_FORMAT_ARGB8888); close(fd); } @@ -176,5 +177,6 @@ ShmBuffer::~ShmBuffer() { munmap(image.bits(), image.byteCount()); wl_buffer_destroy(handle); + wl_shm_pool_destroy(shm_pool); } |