diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-09-30 17:09:49 +0300 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-10-09 09:40:10 +0200 |
commit | bbd4a8f85b2e0ddaa94458569b8b5aa4128c52b1 (patch) | |
tree | 4649a8df94b875073245d1487b23b8ad48a12a57 /src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp | |
parent | 090a39558d99115698e34d61a8d914da4a0637bd (diff) |
Fix the compositor's wayland versioning
We cannot just assume all clients implement the same version of the
various interfaces as the compositor does. Keep track of them, and
react accordingly when creating a resource or sending an event.
Change-Id: I9792433a14d49c5c4df0c892fc1349ce0dfb0d43
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp')
-rw-r--r-- | src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp index c15f3d154..7e7a14ab8 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp @@ -89,7 +89,7 @@ struct ::wl_resource *LibHybrisEglServerBuffer::resourceForClient(struct ::wl_cl return 0; } struct ::wl_resource *egl_resource = (*egl_it)->handle; - Resource *resource = add(client); + Resource *resource = add(client, 1, 1); wl_resource *bufRes = wl_client_new_object(client, &qt_libhybris_buffer_interface, 0, 0); m_integration->send_server_buffer_created(egl_resource, resource->handle, bufRes, m_fds.size(), QByteArray((char *)m_ints.data(), m_ints.size() * sizeof(int32_t)), @@ -174,7 +174,7 @@ void LibHybrisEglServerBufferIntegration::initializeHardware(QWaylandCompositor return; } - QtWaylandServer::qt_libhybris_egl_server_buffer::init(compositor->waylandDisplay()); + QtWaylandServer::qt_libhybris_egl_server_buffer::init(compositor->waylandDisplay(), 1); } bool LibHybrisEglServerBufferIntegration::supportsFormat(QtWayland::ServerBuffer::Format format) const |