diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-09-21 07:24:25 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-09-30 07:10:50 +0000 |
| commit | a44069bc8d0b09cd5b47259e0094c1eed28eb15c (patch) | |
| tree | 680baef1557c12ebb9de70a9afc2d3692c17d97e | |
| parent | 4e967f9f84dab2e68f943ee5e26430bd6cb76e81 (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
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 010d2456d8bc02d1c8ce8e0f16f0ecd59ac08803)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 3ca0d6191..ab5948e49 100644 --- a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -621,7 +621,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; |