diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-09-21 07:24:25 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-09-30 05:40:20 +0000 |
| commit | 010d2456d8bc02d1c8ce8e0f16f0ecd59ac08803 (patch) | |
| tree | 10c19db7f4a2427c234e01af0db49d7feafc7c06 | |
| parent | 88ac9513465d900f135da8cec94db2634ee63a3d (diff) | |
Only use surfaceSize if m_surfaceSize is not valid
This amends 2e3607aa120324f60832ca1cd42aaeaf22cc148d which made it
always use surfaceSize. But if m_surfaceSize->size() is valid then this
should be used as it will account for HighDPI setups.
Fixes: QTBUG-86721
Change-Id: I634b6c3257ac2dcf8042acbbeb999960f68bb266
Pick-to: 5.15 5.12
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp index b7f59741c..72368ae1e 100644 --- a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -623,7 +623,7 @@ QSize SubmissionContext::renderTargetSize(const QSize &surfaceSize) const return renderTargetSize; } } else { - renderTargetSize = surfaceSize; + renderTargetSize = m_surface->size().isValid() ? m_surface->size() : surfaceSize; if (m_surface->surfaceClass() == QSurface::Window) { const float dpr = static_cast<QWindow *>(m_surface)->devicePixelRatio(); renderTargetSize *= dpr; |