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 "Updates for NativeImageInterface" into devel/master
[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
e3629d3
..
18d4abc
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.h
@@
-32,6
+32,7
@@
namespace Dali
{
namespace Dali
{
+class Texture;
namespace Toolkit
{
namespace Toolkit
{
@@
-66,6
+67,10
@@
public:
GRADIENT_SHADER_LINEAR_BOUNDING_BOX,
GRADIENT_SHADER_RADIAL_USER_SPACE,
GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
GRADIENT_SHADER_LINEAR_BOUNDING_BOX,
GRADIENT_SHADER_RADIAL_USER_SPACE,
GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
+ GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_CORNER,
+ GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_CORNER,
+ GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_CORNER,
+ GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_CORNER,
IMAGE_SHADER,
IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
IMAGE_SHADER,
IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
@@
-163,10
+168,10
@@
public:
static Geometry CreateGridGeometry( Uint16Pair gridSize );
/**
static Geometry CreateGridGeometry( Uint16Pair gridSize );
/**
- * @brief Returns a
n image to be used
when a visual has failed to correctly render
- * @return The broken image
handl
e.
+ * @brief Returns a
new Texture to use
when a visual has failed to correctly render
+ * @return The broken image
textur
e.
*/
*/
-
Imag
e GetBrokenVisualImage();
+
Textur
e GetBrokenVisualImage();
/**
* @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
/**
* @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
@@
-241,6
+246,7
@@
private:
ImageAtlasManagerPtr mAtlasManager;
TextureManager mTextureManager;
NPatchLoader mNPatchLoader;
ImageAtlasManagerPtr mAtlasManager;
TextureManager mTextureManager;
NPatchLoader mNPatchLoader;
+ Texture mBrokenImageTexture;
SvgRasterizeThread* mSvgRasterizeThread;
std::unique_ptr< VectorAnimationThread > mVectorAnimationThread;
std::string mBrokenImageUrl;
SvgRasterizeThread* mSvgRasterizeThread;
std::unique_ptr< VectorAnimationThread > mVectorAnimationThread;
std::string mBrokenImageUrl;