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 /src/compositor/wayland_wrapper/wlcompositor.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 'src/compositor/wayland_wrapper/wlcompositor.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/wlcompositor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp index 5b5c10787..9388ab9e6 100644 --- a/src/compositor/wayland_wrapper/wlcompositor.cpp +++ b/src/compositor/wayland_wrapper/wlcompositor.cpp @@ -42,7 +42,6 @@ #include "waylandinput.h" #include "wldisplay.h" -#include "wlshmbuffer.h" #include "wlsurface.h" #include "waylandcompositor.h" #include "wldatadevicemanager.h" @@ -120,7 +119,6 @@ Compositor::Compositor(WaylandCompositor *qt_compositor) : m_display(new Display) , m_default_input_device(0) , m_pageFlipper(0) - , m_shm(m_display) , m_current_frame(0) , m_last_queued_buf(-1) , m_qt_compositor(qt_compositor) @@ -153,6 +151,8 @@ Compositor::Compositor(WaylandCompositor *qt_compositor) m_shell = new Shell(); wl_display_add_global(m_display->handle(), &wl_shell_interface, m_shell, Shell::bind_func); + wl_display_init_shm(m_display->handle()); + m_outputExtension = new OutputExtensionGlobal(this); m_surfaceExtension = new SurfaceExtensionGlobal(this); m_qtkeyExtension = new QtKeyExtensionGlobal(this); |