summaryrefslogtreecommitdiffstats
path: root/src/render/texture/textureimage.cpp
diff options
context:
space:
mode:
authorWieland Hagen <wieland.hagen@kdab.com>2016-02-18 16:31:31 +0100
committerWieland Hagen <wieland.hagen@kdab.com>2016-02-24 13:51:11 +0000
commit192f278cf1eb3b3074b0c6f0b0f18bf1dea463c3 (patch)
tree2159808084ed043916d10f6c3448682ba65f02ed /src/render/texture/textureimage.cpp
parent4fa958cc987f295e799a7e41706ad016973ab994 (diff)
Added AbstractRenderer pointer to RenderBackendNode
Modified all node functors to pass QRenderAspect's renderer instance to all newly created backend nodes Change-Id: Iffa4941bff53f6acf87f46789219c7ae2f123615 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/textureimage.cpp')
-rw-r--r--src/render/texture/textureimage.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index 47a0dbd17..7ce782e6d 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -158,12 +158,13 @@ void TextureImage::updateDNA()
+ (m_textureDataHandle.handle() << 12));
}
-TextureImageFunctor::TextureImageFunctor(TextureManager *textureManager,
- TextureImageManager *textureImageManager,
- TextureDataManager *textureDataManager)
+TextureImageFunctor::TextureImageFunctor(AbstractRenderer *renderer, TextureManager *textureManager,
+ TextureImageManager *textureImageManager,
+ TextureDataManager *textureDataManager)
: m_textureManager(textureManager)
, m_textureImageManager(textureImageManager)
, m_textureDataManager(textureDataManager)
+ , m_renderer(renderer)
{
}
@@ -174,6 +175,7 @@ Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend) c
backend->setTextureImageManager(m_textureImageManager);
backend->setTextureDataManager(m_textureDataManager);
backend->setPeer(frontend);
+ backend->setRenderer(m_renderer);
return backend;
}