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

scene: Port qpainter rendering away from surface-to-buffer matrix

Browse source 
This fixes rendering of surfaces with transformed buffers in qpainter
renderer.
This commit is contained in:
Vlad Zahorodnii 2023-08-21 12:06:51 +03:00
parent 54e2a5761c
commit adf8ed8f34
1 changed files with 51 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/scene/itemrenderer_qpainter.cpp
View file

@ -137,15 +137,61 @@ void ItemRendererQPainter::renderSurfaceItem(QPainter *painter, SurfaceItem *sur
} }
surfaceItem->resetDamage(); surfaceItem->resetDamage();
const OutputTransform surfaceToBufferTransform = surfaceItem->bufferTransform().inverted();
const QSizeF transformedSize = surfaceToBufferTransform.map(surfaceItem->size());
painter->save();
switch (surfaceToBufferTransform.kind()) {
case OutputTransform::Normal:
break;
case OutputTransform::Rotated90:
painter->translate(0, transformedSize.width());
painter->rotate(-90);
break;
case OutputTransform::Rotated180:
painter->translate(transformedSize.width(), transformedSize.height());
painter->rotate(-180);
break;
case OutputTransform::Rotated270:
painter->translate(transformedSize.height(), 0);
painter->rotate(-270);
break;
case OutputTransform::Flipped:
painter->translate(transformedSize.width(), 0);
painter->scale(-1, 1);
break;
case OutputTransform::Flipped90:
painter->rotate(-90);
painter->scale(-1, 1);
break;
case OutputTransform::Flipped180:
painter->translate(0, transformedSize.height());
painter->rotate(-180);
painter->scale(-1, 1);
break;
case OutputTransform::Flipped270:
painter->translate(transformedSize.height(), transformedSize.width());
painter->rotate(-270);
painter->scale(-1, 1);
break;
}
const QRectF sourceBox = surfaceItem->bufferSourceBox();
const qreal xSourceBoxScale = sourceBox.width() / transformedSize.width();
const qreal ySourceBoxScale = sourceBox.height() / transformedSize.height();
const QVector<QRectF> shape = surfaceItem->shape(); const QVector<QRectF> shape = surfaceItem->shape();
for (const QRectF rect : shape) { for (const QRectF rect : shape) {
const QMatrix4x4 matrix = surfaceItem->surfaceToBufferMatrix(); const QRectF target = surfaceToBufferTransform.map(rect, surfaceItem->size());
const QPointF bufferTopLeft = matrix.map(rect.topLeft()); const QRectF source(sourceBox.x() + target.x() * xSourceBoxScale,
const QPointF bufferBottomRight = matrix.map(rect.bottomRight()); sourceBox.y() + target.y() * ySourceBoxScale,
target.width() * xSourceBoxScale,
target.height() * ySourceBoxScale);
painter->drawImage(rect, platformSurfaceTexture->image(), painter->drawImage(target, platformSurfaceTexture->image(), source);
QRectF(bufferTopLeft, bufferBottomRight));
} }
painter->restore();
} }
void ItemRendererQPainter::renderDecorationItem(QPainter *painter, DecorationItem *decorationItem) const void ItemRendererQPainter::renderDecorationItem(QPainter *painter, DecorationItem *decorationItem) const