diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/compositor/delegated_frame_node.cpp | 17 | ||||
-rw-r--r-- | src/core/render_widget_host_view_qt_delegate.h | 2 |
2 files changed, 6 insertions, 13 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); diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h index 6066284d9..4ee790ce9 100644 --- a/src/core/render_widget_host_view_qt_delegate.h +++ b/src/core/render_widget_host_view_qt_delegate.h @@ -65,7 +65,6 @@ class QSGTexture; class QVariant; class QInputMethodEvent; -class QSGInternalImageNode; class QSGImageNode; QT_END_NAMESPACE @@ -102,7 +101,6 @@ public: virtual QWindow* window() const = 0; virtual QSGTexture *createTextureFromImage(const QImage &) = 0; virtual QSGLayer *createLayer() = 0; - virtual QSGInternalImageNode *createInternalImageNode() = 0; virtual QSGImageNode *createImageNode() = 0; virtual QSGRectangleNode *createRectangleNode() = 0; virtual void update() = 0; |