summaryrefslogtreecommitdiffstats
path: root/src/adaptationlayers/default/default_texturenode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/adaptationlayers/default/default_texturenode.cpp')
-rw-r--r--src/adaptationlayers/default/default_texturenode.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/adaptationlayers/default/default_texturenode.cpp b/src/adaptationlayers/default/default_texturenode.cpp
index 98aef05..5dcbba5 100644
--- a/src/adaptationlayers/default/default_texturenode.cpp
+++ b/src/adaptationlayers/default/default_texturenode.cpp
@@ -85,9 +85,10 @@ void DefaultTextureNode::setOpacity(qreal opacity)
setMaterial(opacity == 1 ? &m_material : &m_materialO); // Indicate that the material state has changed.
}
-void DefaultTextureNode::setTexture(const TextureReference *texture)
+void DefaultTextureNode::setTexture(const QSGTextureRef &texture)
{
- if (texture == m_texture)
+ if (texture.texture() == m_texture.texture()
+ && texture.subRect() == m_texture.subRect())
return;
m_texture = texture;
@@ -123,7 +124,7 @@ void DefaultTextureNode::update(uint updateFlags)
void DefaultTextureNode::updateGeometry()
{
- if (!m_texture)
+ if (m_texture.isNull())
return;
Geometry *g = geometry();
@@ -195,7 +196,7 @@ void DefaultTextureNode::updateGeometry()
qreal xSrcOffset = qFloor(normalizedSource.left());
qreal ySrcOffset = qFloor(normalizedSource.top());
- QRectF texSrcRect = m_texture->subRect();
+ QRectF texSrcRect = m_texture.subRect();
for (int j = 0; j < ySrc.size() - 1; ++j) {
for (int i = 0; i < xSrc.size() - 1; ++i) {