summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-01-29 14:29:25 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-02-08 15:02:13 +0000
commit727d5ad27b0456b2b94188a1fdfc18c4ed781c3a (patch)
treedef346bd6e05846a9b660525c07f94b1b9cebfbd /src/render
parent616c1456271c9bb9cb510987409b71d52c019b4d (diff)
TextureImageManager in Renderer
Change-Id: Id6a41db8eed2874cc5a06ddc5feba6c9b0aced53 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r--src/render/backend/renderer.cpp1
-rw-r--r--src/render/backend/renderer_p.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index dcc108488..a5df1a395 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -140,6 +140,7 @@ Renderer::Renderer(QRenderAspect::RenderType type, int cachedFrames)
, m_parameterManager(new ParameterManager())
, m_shaderDataManager(new ShaderDataManager())
, m_uboManager(new UBOManager())
+ , m_textureImageManager(new TextureImageManager())
, m_renderQueues(new RenderQueues(cachedFrames - 1))
, m_renderThread(type == QRenderAspect::Threaded ? new RenderThread(this) : Q_NULLPTR)
, m_frameCount(0)
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index da803e24a..e5bdaf38d 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -125,6 +125,7 @@ class SortCriterionManager;
class ParameterManager;
class ShaderDataManager;
class UBOManager;
+class TextureImageManager;
class Renderer
{
@@ -178,6 +179,7 @@ public:
inline ParameterManager *parameterManager() const { return m_parameterManager; }
inline ShaderDataManager *shaderDataManager() const { return m_shaderDataManager; }
inline UBOManager *uboManager() const { return m_uboManager; }
+ inline TextureImageManager *textureImageManager() const { return m_textureImageManager; }
inline HMaterial defaultMaterialHandle() const { return m_defaultMaterialHandle; }
inline HEffect defaultEffectHandle() const { return m_defaultEffectHandle; }
@@ -260,6 +262,7 @@ private:
ParameterManager *m_parameterManager;
ShaderDataManager *m_shaderDataManager;
UBOManager *m_uboManager;
+ TextureImageManager *m_textureImageManager;
QTimer *m_frameTimer;