diff options
| -rw-r--r-- | src/compositor/compositor_api/waylandsurfacenode.cpp | 10 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/wlsurface.cpp | 18 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/wlsurfacebuffer.cpp | 3 |
3 files changed, 19 insertions, 12 deletions
diff --git a/src/compositor/compositor_api/waylandsurfacenode.cpp b/src/compositor/compositor_api/waylandsurfacenode.cpp index e6571751c..a4063ccb4 100644 --- a/src/compositor/compositor_api/waylandsurfacenode.cpp +++ b/src/compositor/compositor_api/waylandsurfacenode.cpp @@ -39,10 +39,12 @@ void WaylandSurfaceNode::preprocess() { QMutexLocker locker(WaylandSurfaceItem::mutex); - //Update if the item is dirty and we haven't done an updateTexture for this frame - if (m_item && m_item->m_damaged && !m_textureUpdated) { - m_item->updateTexture(); - updateTexture(); + if (m_item && m_item->surface()) { + //Update if the item is dirty and we haven't done an updateTexture for this frame + if (m_item->m_damaged && !m_textureUpdated) { + m_item->updateTexture(); + updateTexture(); + } } //Reset value for next frame: we have not done updatePaintNode yet m_textureUpdated = false; diff --git a/src/compositor/wayland_wrapper/wlsurface.cpp b/src/compositor/wayland_wrapper/wlsurface.cpp index 579c27bd1..ff13e017a 100644 --- a/src/compositor/wayland_wrapper/wlsurface.cpp +++ b/src/compositor/wayland_wrapper/wlsurface.cpp @@ -377,14 +377,16 @@ SurfaceBuffer *Surface::createSurfaceBuffer(struct wl_buffer *buffer) bool Surface::postBuffer() { #ifdef QT_COMPOSITOR_WAYLAND_GL if (m_waylandSurface->handle() == m_compositor->directRenderSurface()) { - SurfaceBuffer *surfaceBuffer = m_backBuffer? m_backBuffer : m_frontBuffer; - if (surfaceBuffer && m_compositor->pageFlipper()) { - if (m_compositor->pageFlipper()->displayBuffer(surfaceBuffer)) { - surfaceBuffer->setPageFlipperHasBuffer(true); - m_compositor->setDirectRenderingActive(true); - return true; - } else { - qDebug() << "could not post buffer"; + SurfaceBuffer *surfaceBuffer = currentSurfaceBuffer(); + if (surfaceBuffer && surfaceBuffer->waylandBufferHandle()) { + if (m_compositor->pageFlipper()) { + if (m_compositor->pageFlipper()->displayBuffer(surfaceBuffer)) { + surfaceBuffer->setPageFlipperHasBuffer(true); + m_compositor->setDirectRenderingActive(true); + return true; + } else { + qDebug() << "could not post buffer"; + } } } } diff --git a/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp index ced3ed2f0..61e241c32 100644 --- a/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp +++ b/src/compositor/wayland_wrapper/wlsurfacebuffer.cpp @@ -199,6 +199,9 @@ void SurfaceBuffer::handleDisplayed() void *SurfaceBuffer::handle() const { + if (!m_buffer) + return 0; + if (!m_handle) { SurfaceBuffer *that = const_cast<SurfaceBuffer *>(this); if (isShmBuffer()) { |