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 SWIG C# Build" 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
0b77e53
..
8bbae5c
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.h
@@
-69,7
+69,8
@@
public:
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
SVG_SHADER,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
SVG_SHADER,
- SHADER_TYPE_MAX = SVG_SHADER
+ WIREFRAME_SHADER,
+ SHADER_TYPE_MAX = WIREFRAME_SHADER
};
/**
};
/**
@@
-81,7
+82,8
@@
public:
BORDER_GEOMETRY,
NINE_PATCH_GEOMETRY,
NINE_PATCH_BORDER_GEOMETRY,
BORDER_GEOMETRY,
NINE_PATCH_GEOMETRY,
NINE_PATCH_BORDER_GEOMETRY,
- GEOMETRY_TYPE_MAX = NINE_PATCH_BORDER_GEOMETRY
+ WIREFRAME_GEOMETRY,
+ GEOMETRY_TYPE_MAX = WIREFRAME_GEOMETRY
};
public:
};
public:
@@
-173,16
+175,6
@@
public:
bool CleanRendererCache( const std::string& key );
/**
bool CleanRendererCache( const std::string& key );
/**
- * @brief Cache the wireframe renderer
- */
- void CacheWireframeRenderer( Renderer& renderer );
-
- /**
- * @brief Request the wireframe renderer;
- */
- Renderer GetWireframeRenderer();
-
- /**
* Get the image atlas manager.
* @return A pointer to the atlas manager
*/
* Get the image atlas manager.
* @return A pointer to the atlas manager
*/