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

Avoid image format conversion when drawing window nonclient area

Browse Source 
This radically speeds up window resizing and dragging.

Fixes: QTBUG-105709
Change-Id: I844601a5b139d21024db0c373482af18f350d0eb
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 2a23652bbbba8def270b78d76c91a5a96d391106)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mikolaj Boc 2022-08-16 16:45:07 +02:00 committed by Qt Cherry-pick Bot
parent e70018c814
commit bf94566694
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/wasm/qwasmcompositor.cpp
View File

@ -546,7 +546,7 @@ void QWasmCompositor::drawWindowDecorations(QOpenGLTextureBlitter *blitter, QWas
int height = window->windowFrameGeometry().height();
qreal dpr = window->devicePixelRatio();
QImage image(QSize(width * dpr, height * dpr), QImage::Format_RGB32);
QImage image(QSize(width * dpr, height * dpr), QImage::Format_ARGB32_Premultiplied);
image.setDevicePixelRatio(dpr);
QPainter painter(&image);
painter.fillRect(QRect(0, 0, width, height), painter.background());
@ -567,12 +567,19 @@ void QWasmCompositor::drawWindowDecorations(QOpenGLTextureBlitter *blitter, QWas
texture.setMinificationFilter(QOpenGLTexture::Nearest);
texture.setMagnificationFilter(QOpenGLTexture::Nearest);
texture.setWrapMode(QOpenGLTexture::ClampToEdge);
texture.setData(image, QOpenGLTexture::DontGenerateMipMaps);
texture.setFormat(QOpenGLTexture::RGBAFormat);
texture.setSize(image.width(), image.height());
texture.setMipLevels(1);
texture.allocateStorage(QOpenGLTexture::RGBA, QOpenGLTexture::UInt8);
QOpenGLPixelTransferOptions uploadOptions;
uploadOptions.setAlignment(1);
texture.create();
texture.bind();
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, image.width(), image.height(), GL_RGBA, GL_UNSIGNED_BYTE,
image.constScanLine(0));
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, image.width(), image.height(), GL_RGBA,
GL_UNSIGNED_BYTE, image.constScanLine(0));
QRect windowCanvasGeometry = window->windowFrameGeometry().translated(-screen->geometry().topLeft());
blit(blitter, screen, &texture, windowCanvasGeometry);