diff options
author | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-08-16 16:45:07 +0200 |
---|---|---|
committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-08-20 01:16:41 +0200 |
commit | 2a23652bbbba8def270b78d76c91a5a96d391106 (patch) | |
tree | ff88793dc9486051a4cf167804a5204d11bc1579 | |
parent | f3f0d646b90cf31f8ff855c5470b01fd1bea75a0 (diff) |
Avoid image format conversion when drawing window nonclient area
This radically speeds up window resizing and dragging.
Fixes: QTBUG-105709
Pick-to: 6.4
Change-Id: I844601a5b139d21024db0c373482af18f350d0eb
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r-- | src/plugins/platforms/wasm/qwasmcompositor.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index 53daa62bed..30c61d2668 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -488,7 +488,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()); @@ -509,12 +509,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); |