diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-08-20 08:35:17 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-20 09:43:19 +0000 |
commit | 9bf2094621e3fba71710f47d7121f1182c3f3337 (patch) | |
tree | b39d61d6f6e1759adf1c98d37bacbb8e21f82809 /src/quick3d | |
parent | 9a7e8df77badae8c740681e47e0b44fe5c71df83 (diff) | |
parent | f09744e1e09baa63e22b6a0bfc8740e6930daf45 (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/quick3d')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index f3b0b67e5..79aa2b4e5 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -609,13 +609,13 @@ void Scene3DRenderer::render() ContextSaver saver; - const QSize currentSize = m_item->boundingRect().size().toSize(); + const QSize currentSize = m_item->boundingRect().size().toSize() * window->effectiveDevicePixelRatio(); const bool forceRecreate = currentSize != m_lastSize || m_multisample != m_lastMultisample; // Rebuild FBO and textures if never created or a resize has occurred if ((m_multisampledFBO.isNull() || forceRecreate) && m_multisample) { qCDebug(Scene3D) << Q_FUNC_INFO << "Creating multisample framebuffer"; - m_multisampledFBO.reset(createMultisampledFramebufferObject(m_item->boundingRect().size().toSize())); + m_multisampledFBO.reset(createMultisampledFramebufferObject(currentSize)); if (m_multisampledFBO->format().samples() == 0 || !QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()) { qCDebug(Scene3D) << Q_FUNC_INFO << "Failed to create multisample framebuffer"; m_multisample = false; @@ -624,7 +624,7 @@ void Scene3DRenderer::render() } if (m_finalFBO.isNull() || forceRecreate) { - m_finalFBO.reset(createFramebufferObject(m_item->boundingRect().size().toSize())); + m_finalFBO.reset(createFramebufferObject(currentSize)); m_texture.reset(window->createTextureFromId(m_finalFBO->texture(), m_finalFBO->size(), QQuickWindow::TextureHasAlphaChannel)); m_node->setTexture(m_texture.data()); } |