diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
| commit | 9df70b0304fa44d2f1b1504d7e58d718eab4343a (patch) | |
| tree | 95a7b207a39c2b44bd4e80bcc1ea3d36bedd9a99 /src/quick/scenegraph/util/qsgpainternode.cpp | |
| parent | 648d4ae6a3591e916f175e32c12a2ea4f8edb6a9 (diff) | |
| parent | 900e3d4ad5f2bc4994ddf164c15c641f85630b81 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I10d4f9e993d23750a6e8ddc1291b79e47fc83c64
Diffstat (limited to 'src/quick/scenegraph/util/qsgpainternode.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgpainternode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgpainternode.cpp b/src/quick/scenegraph/util/qsgpainternode.cpp index d6bec550d3..797fc4d145 100644 --- a/src/quick/scenegraph/util/qsgpainternode.cpp +++ b/src/quick/scenegraph/util/qsgpainternode.cpp @@ -111,7 +111,7 @@ QSGPainterNode::QSGPainterNode(QQuickPaintedItem *item) , m_dirtyRenderTarget(false) , m_dirtyTexture(false) { - m_context = static_cast<QQuickPaintedItemPrivate *>(QObjectPrivate::get(item))->sceneGraphContext(); + m_context = static_cast<QQuickPaintedItemPrivate *>(QObjectPrivate::get(item))->sceneGraphRenderContext(); setMaterial(&m_materialO); setOpaqueMaterial(&m_material); @@ -260,7 +260,7 @@ void QSGPainterNode::updateRenderTarget() if (m_actualRenderTarget == QQuickPaintedItem::FramebufferObject || m_actualRenderTarget == QQuickPaintedItem::InvertedYFramebufferObject) { - const QOpenGLContext *ctx = m_context->glContext(); + const QOpenGLContext *ctx = m_context->openglContext(); if (m_fbo && !m_dirtyGeometry && (!ctx->format().samples() || !m_multisamplingSupported)) return; @@ -323,7 +323,7 @@ void QSGPainterNode::updateFBOSize() fboWidth = qMax(QT_MINIMUM_DYNAMIC_FBO_SIZE, qt_next_power_of_two(m_size.width())); fboHeight = qMax(QT_MINIMUM_DYNAMIC_FBO_SIZE, qt_next_power_of_two(m_size.height())); } else { - QSize minimumFBOSize = m_context->minimumFBOSize(); + QSize minimumFBOSize = m_context->sceneGraphContext()->minimumFBOSize(); fboWidth = qMax(minimumFBOSize.width(), m_size.width()); fboHeight = qMax(minimumFBOSize.height(), m_size.height()); } |