diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-23 14:30:04 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-23 14:30:22 +0200 |
commit | 3758102901d5c0413d52707c93fc6b2ee023262b (patch) | |
tree | 9d03eb01c004fd63dd428489f20ce553b6d49afe /src/plugins/platforms/wayland/qwaylandwindow.cpp | |
parent | 365fa4e41a356fbeb27deb513773c08c0252ea5e (diff) |
Make sure to call damage on the buffer when we damage it
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandwindow.cpp')
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandwindow.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 8fc8700d2..2376df55c 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -129,22 +129,17 @@ void QWaylandWindow::attach(QWaylandBuffer *buffer) } } -void QWaylandWindow::damage(const QRegion ®ion) +void QWaylandWindow::damage(const QRect &rect) { //We have to do sync stuff before calling damage, or we might //get a frame callback before we get the timestamp - mDisplay->frameCallback(QWaylandWindow::frameCallback, mSurface, this); - mWaitingForFrameSync = true; - - QVector<QRect> rects = region.rects(); - for (int i = 0; i < rects.size(); i++) { - const QRect rect = rects.at(i); - wl_buffer_damage(mBuffer->buffer(), rect.x(), rect.y(), rect.width(), rect.height()); - wl_surface_damage(mSurface, - rect.x(), rect.y(), rect.width(), rect.height()); - wl_buffer_damage(mBuffer->buffer(), - rect.x(), rect.y(), rect.width(), rect.height()); + if (!mWaitingForFrameSync) { + mDisplay->frameCallback(QWaylandWindow::frameCallback, mSurface, this); + mWaitingForFrameSync = true; } + + wl_surface_damage(mSurface, + rect.x(), rect.y(), rect.width(), rect.height()); } void QWaylandWindow::newSurfaceCreated() @@ -152,6 +147,7 @@ void QWaylandWindow::newSurfaceCreated() if (mBuffer) { wl_surface_attach(mSurface,mBuffer->buffer(),0,0); QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size())); + wl_surface_damage(mSurface,0,0,mBuffer->size().width(),mBuffer->size().height()); } } |