projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix a crash in ImageVisual in case of an invalid image and changed to render...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-cache.h
diff --git
a/dali-toolkit/internal/visuals/visual-factory-cache.h
b/dali-toolkit/internal/visuals/visual-factory-cache.h
index
470cf07
..
cc68e0f
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.h
@@
-28,6
+28,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/npatch-loader.h>
#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/npatch-loader.h>
#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
+#include <dali-toolkit/internal/visuals/texture-manager.h>
namespace Dali
{
namespace Dali
{
@@
-37,11
+38,12
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
-
class ImageAtlasManager;
class ImageAtlasManager;
+class NPatchLoader;
+class TextureManager;
+
typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
-class NPatchLoader;
/**
* Caches shaders and geometries. Owned by VisualFactory.
/**
* Caches shaders and geometries. Owned by VisualFactory.
@@
-145,6
+147,12
@@
public:
ImageAtlasManagerPtr GetAtlasManager();
/**
ImageAtlasManagerPtr GetAtlasManager();
/**
+ * Get the texture manager
+ * @return A reference to the texture manager
+ */
+ TextureManager& GetTextureManager();
+
+ /**
* Get the N-Patch texture cache.
* @return A reference to the N patch loader
*/
* Get the N-Patch texture cache.
* @return A reference to the N patch loader
*/
@@
-185,8
+193,8
@@
private:
Shader mShader[SHADER_TYPE_MAX+1];
ImageAtlasManagerPtr mAtlasManager;
Shader mShader[SHADER_TYPE_MAX+1];
ImageAtlasManagerPtr mAtlasManager;
-
NPatchLoader mNPatchLoad
er;
-
+
TextureManager mTextureManag
er;
+ NPatchLoader mNPatchLoader;
SvgRasterizeThread* mSvgRasterizeThread;
};
SvgRasterizeThread* mSvgRasterizeThread;
};