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

showpaint: Account for render target scale when creating geometry

Browse source
This commit is contained in:
Arjen Hiemstra 2022-08-04 11:44:24 +02:00
parent 5ab9008ca6
commit 78d2c1f7e0
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/effects/showpaint/showpaint.cpp
View file

@ -48,7 +48,7 @@ void ShowPaintEffect::paintScreen(int mask, const QRegion &region, ScreenPaintDa
m_painted = QRegion();
effects->paintScreen(mask, region, data);
if (effects->isOpenGLCompositing()) {
paintGL(data.projectionMatrix());
paintGL(data.projectionMatrix(), effects->renderTargetScale());
} else if (effects->compositingType() == QPainterCompositing) {
paintQPainter();
}
@ -63,7 +63,7 @@ void ShowPaintEffect::paintWindow(EffectWindow *w, int mask, QRegion region, Win
effects->paintWindow(w, mask, region, data);
}
void ShowPaintEffect::paintGL(const QMatrix4x4 &projection)
void ShowPaintEffect::paintGL(const QMatrix4x4 &projection, qreal scale)
{
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
vbo->reset();
@ -78,12 +78,13 @@ void ShowPaintEffect::paintGL(const QMatrix4x4 &projection)
QVector<float> verts;
verts.reserve(m_painted.rectCount() * 12);
for (const QRect &r : m_painted) {
verts << r.x() + r.width() << r.y();
verts << r.x() << r.y();
verts << r.x() << r.y() + r.height();
verts << r.x() << r.y() + r.height();
verts << r.x() + r.width() << r.y() + r.height();
verts << r.x() + r.width() << r.y();
const auto deviceRect = scaledRect(r, scale);
verts << deviceRect.x() + deviceRect.width() << deviceRect.y();
verts << deviceRect.x() << deviceRect.y();
verts << deviceRect.x() << deviceRect.y() + deviceRect.height();
verts << deviceRect.x() << deviceRect.y() + deviceRect.height();
verts << deviceRect.x() + deviceRect.width() << deviceRect.y() + deviceRect.height();
verts << deviceRect.x() + deviceRect.width() << deviceRect.y();
}
vbo->setData(verts.count() / 2, 2, verts.data(), nullptr);
vbo->render(GL_TRIANGLES);

2
src/effects/showpaint/showpaint.h
View file

@ -31,7 +31,7 @@ private Q_SLOTS:
void toggle();
private:
void paintGL(const QMatrix4x4 &projection);
void paintGL(const QMatrix4x4 &projection, qreal scale);
void paintQPainter();
bool m_active = false;