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 "Optimize some text-typesetter rendering operations" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
image-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/image/image-visual.cpp
b/dali-toolkit/internal/visuals/image/image-visual.cpp
index
263974f
..
a2e9096
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/image/image-visual.cpp
@@
-51,7
+51,7
@@
namespace Internal
{
namespace
{
{
namespace
{
-const int CUSTOM_PROPERTY_COUNT(
14); // 5 transform properties +
wrap, pixel area, atlas, pixalign, + border/corner
+const int CUSTOM_PROPERTY_COUNT(
9); //
wrap, pixel area, atlas, pixalign, + border/corner
// fitting modes
DALI_ENUM_TO_STRING_TABLE_BEGIN(FITTING_MODE)
// fitting modes
DALI_ENUM_TO_STRING_TABLE_BEGIN(FITTING_MODE)
@@
-202,7
+202,7
@@
ImageVisual::~ImageVisual()
else if(mImageUrl.IsBufferResource())
{
TextureManager& textureManager = mFactoryCache.GetTextureManager();
else if(mImageUrl.IsBufferResource())
{
TextureManager& textureManager = mFactoryCache.GetTextureManager();
- textureManager.RemoveE
xternalE
ncodedImageBuffer(mImageUrl.GetUrl());
+ textureManager.RemoveEncodedImageBuffer(mImageUrl.GetUrl());
}
}
}
}
@@
-567,11
+567,11
@@
void ImageVisual::OnInitialize()
Shader shader = GenerateShader();
// Create the renderer
Shader shader = GenerateShader();
// Create the renderer
- mImpl->mRenderer = Renderer::New(geometry, shader);
+ mImpl->mRenderer =
Visual
Renderer::New(geometry, shader);
mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
//Register transform properties
mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
//Register transform properties
- mImpl->mTransform.
Register
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+ mImpl->mTransform.
Set
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
EnablePreMultipliedAlpha(IsPreMultipliedAlphaEnabled());
}
EnablePreMultipliedAlpha(IsPreMultipliedAlphaEnabled());
}
@@
-817,16
+817,10
@@
void ImageVisual::OnSetTransform()
{
if(mImpl->mRenderer)
{
{
if(mImpl->mRenderer)
{
- mImpl->mTransform.
Register
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+ mImpl->mTransform.
Set
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
}
}
}
}
-bool ImageVisual::IsResourceReady() const
-{
- return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY ||
- mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED);
-}
-
void ImageVisual::UpdateShader()
{
if(mImpl->mRenderer)
void ImageVisual::UpdateShader()
{
if(mImpl->mRenderer)