yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ShmPool returns Buffer instead of wl_buffer

Browse source 
Requires c561316236279754c5570009ec6adb5da215efd8 in kwayland.
This commit is contained in:
Martin Gräßlin 2014-09-20 15:13:17 +02:00
parent 6833581bbb
commit 5eceda4ae6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene_xrender.cpp
View file

@ -284,7 +284,7 @@ void WaylandXRenderBackend::present(int mask, const QRegion &damage)
Wayland::WaylandBackend *wl = Wayland::WaylandBackend::self(); Wayland::WaylandBackend *wl = Wayland::WaylandBackend::self();
const QSize &size = wl->shellSurfaceSize(); const QSize &size = wl->shellSurfaceSize();
wl_buffer *buffer = wl->shmPool()->createBuffer(size, size.width() * 4, m_shm->buffer()); auto buffer = wl->shmPool()->createBuffer(size, size.width() * 4, m_shm->buffer());
if (!buffer) { if (!buffer) {
qDebug() << "Did not get a buffer"; qDebug() << "Did not get a buffer";
return; return;

4
wayland_backend.cpp
View file

@ -130,11 +130,11 @@ void X11CursorTracker::cursorChanged(uint32_t serial)
void X11CursorTracker::installCursor(const CursorData& cursor) void X11CursorTracker::installCursor(const CursorData& cursor)
{ {
const QImage &cursorImage = cursor.cursor(); const QImage &cursorImage = cursor.cursor();
wl_buffer *buffer = m_backend->shmPool()->createBuffer(cursorImage); auto buffer = m_backend->shmPool()->createBuffer(cursorImage);
if (!buffer) { if (!buffer) {
return; return;
} }
m_seat->installCursorImage(buffer, cursorImage.size(), cursor.hotSpot()); m_seat->installCursorImage(buffer->buffer(), cursorImage.size(), cursor.hotSpot());
} }
void X11CursorTracker::resetCursor() void X11CursorTracker::resetCursor()