1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Add QCALayerBackingStore::preserveFromFrontBuffer helper function

Browse Source 
Pick-to: 6.2
Change-Id: Iadd4791907564b8b82437643c54696ffa778d882
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Tor Arne Vestbø 2021-11-04 14:11:20 +01:00
parent 4ffdf2270a
commit ecfbc918d7
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoabackingstore.h
View File

@ -109,6 +109,8 @@ private:
bool recreateBackBufferIfNeeded(); bool recreateBackBufferIfNeeded();
void finalizeBackBuffer(); void finalizeBackBuffer();
void preserveFromFrontBuffer(const QRegion &region, const QPoint &offset = QPoint());
void backingPropertiesChanged(); void backingPropertiesChanged();
QMacNotificationObserver m_backingPropertiesObserver; QMacNotificationObserver m_backingPropertiesObserver;

30
src/plugins/platforms/cocoa/qcocoabackingstore.mm
View File

@ -451,11 +451,24 @@ void QCALayerBackingStore::finalizeBackBuffer()
if (!m_buffers.back()->isDirty()) if (!m_buffers.back()->isDirty())
return; return;
m_buffers.back()->lock(QPlatformGraphicsBuffer::SWWriteAccess);
preserveFromFrontBuffer(m_buffers.back()->dirtyRegion);
m_buffers.back()->unlock();
// The back buffer is now completely in sync, ready to be presented
m_buffers.back()->dirtyRegion = QRegion();
}
void QCALayerBackingStore::preserveFromFrontBuffer(const QRegion &region, const QPoint &offset)
{
if (m_buffers.front() == m_buffers.back()) if (m_buffers.front() == m_buffers.back())
return; // Nothing to preserve from return; // Nothing to preserve from
QRegion preserveRegion = m_buffers.back()->dirtyRegion; qCDebug(lcQpaBackingStore) << "Preserving" << region << "of front buffer to"
qCDebug(lcQpaBackingStore) << "Preserving" << preserveRegion << "from front to back buffer"; << region.translated(offset) << "of back buffer";
Q_ASSERT(m_buffers.back()->isLocked() == QPlatformGraphicsBuffer::SWWriteAccess);
m_buffers.front()->lock(QPlatformGraphicsBuffer::SWReadAccess); m_buffers.front()->lock(QPlatformGraphicsBuffer::SWReadAccess);
const QImage *frontBuffer = m_buffers.front()->asImage(); const QImage *frontBuffer = m_buffers.front()->asImage();
@ -463,7 +476,6 @@ void QCALayerBackingStore::finalizeBackBuffer()
const QRect frontSurfaceBounds(QPoint(0, 0), m_buffers.front()->size()); const QRect frontSurfaceBounds(QPoint(0, 0), m_buffers.front()->size());
const qreal sourceDevicePixelRatio = frontBuffer->devicePixelRatio(); const qreal sourceDevicePixelRatio = frontBuffer->devicePixelRatio();
m_buffers.back()->lock(QPlatformGraphicsBuffer::SWWriteAccess);
QPainter painter(m_buffers.back()->asImage()); QPainter painter(m_buffers.back()->asImage());
painter.setCompositionMode(QPainter::CompositionMode_Source); painter.setCompositionMode(QPainter::CompositionMode_Source);
@ -471,9 +483,11 @@ void QCALayerBackingStore::finalizeBackBuffer()
const qreal targetDevicePixelRatio = painter.device()->devicePixelRatio(); const qreal targetDevicePixelRatio = painter.device()->devicePixelRatio();
painter.scale(1.0 / targetDevicePixelRatio, 1.0 / targetDevicePixelRatio); painter.scale(1.0 / targetDevicePixelRatio, 1.0 / targetDevicePixelRatio);
for (const QRect &rect : preserveRegion) { for (const QRect &rect : region) {
QRect sourceRect(rect.topLeft() * sourceDevicePixelRatio, rect.size() * sourceDevicePixelRatio); QRect sourceRect(rect.topLeft() * sourceDevicePixelRatio,
QRect targetRect(rect.topLeft() * targetDevicePixelRatio, rect.size() * targetDevicePixelRatio); rect.size() * sourceDevicePixelRatio);
QRect targetRect((rect.topLeft() + offset) * targetDevicePixelRatio,
rect.size() * targetDevicePixelRatio);
#ifdef QT_DEBUG #ifdef QT_DEBUG
if (Q_UNLIKELY(!frontSurfaceBounds.contains(sourceRect.bottomRight()))) { if (Q_UNLIKELY(!frontSurfaceBounds.contains(sourceRect.bottomRight()))) {
@ -484,11 +498,7 @@ void QCALayerBackingStore::finalizeBackBuffer()
painter.drawImage(targetRect, *frontBuffer, sourceRect); painter.drawImage(targetRect, *frontBuffer, sourceRect);
} }
m_buffers.back()->unlock();
m_buffers.front()->unlock(); m_buffers.front()->unlock();
// The back buffer is now completely in sync, ready to be presented
m_buffers.back()->dirtyRegion = QRegion();
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------