diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-10 15:27:12 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-23 19:07:05 +0200 |
commit | 57363264cd0ff4b2f45f5344e18436fe419e2e95 (patch) | |
tree | 5727a9d3145bdcaf23093fd6a5de24f870a24b1c /src/core/compositor | |
parent | 77d3d2d3265640a862c2725737185c1285393942 (diff) |
Remove usage of QSGInternalImageNode
Since 1f01b44d20471a7f4a5029a4c0049e8296749fef landed in qtdeclarative,
the internal API createInternalImageNode() takes one required argument.
However due to the following commit in qtdeclarative
cf24651b550752fbf9bd3afb02aee5d722164658 we no longer need to use
internal image nodes.
Remove their usage, and use the regular image nodes instead.
Change-Id: Ie0cc2a2c1e365bb7fae564ad3c9d880c3a0bf0d9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/compositor')
-rw-r--r-- | src/core/compositor/delegated_frame_node.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/core/compositor/delegated_frame_node.cpp b/src/core/compositor/delegated_frame_node.cpp index dc67b03e2..19e8d1b82 100644 --- a/src/core/compositor/delegated_frame_node.cpp +++ b/src/core/compositor/delegated_frame_node.cpp @@ -195,12 +195,10 @@ public: { Q_ASSERT(layer); Q_ASSERT(m_nodeIterator != m_sceneGraphNodes->end()); - QSGInternalImageNode *imageNode = static_cast<QSGInternalImageNode*>(*m_nodeIterator++); - imageNode->setTargetRect(rect); - imageNode->setInnerTargetRect(rect); - imageNode->setSubSourceRect(layer->convertToNormalizedSourceRect(sourceRect)); + QSGImageNode *imageNode = static_cast<QSGImageNode*>(*m_nodeIterator++); + imageNode->setRect(rect); + imageNode->setSourceRect(sourceRect); imageNode->setTexture(layer); - imageNode->update(); } void setupTextureContentNode(QSGTexture *texture, const QRect &rect, const QRectF &sourceRect, @@ -281,13 +279,10 @@ public: QSGNode *layerChain) override { Q_ASSERT(layer); - // Only QSGInternalImageNode currently supports QSGLayer textures. - QSGInternalImageNode *imageNode = m_apiDelegate->createInternalImageNode(); - imageNode->setTargetRect(rect); - imageNode->setInnerTargetRect(rect); - imageNode->setSubSourceRect(layer->convertToNormalizedSourceRect(sourceRect)); + QSGImageNode *imageNode = m_apiDelegate->createImageNode(); + imageNode->setRect(rect); + imageNode->setSourceRect(sourceRect); imageNode->setTexture(layer); - imageNode->update(); layerChain->appendChildNode(imageNode); m_sceneGraphNodes->append(imageNode); |