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
Rendering API clean-up
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
renderer-factory-impl.cpp
diff --git
a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
index
acb09bf
..
2c88562
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
+++ b/
dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
@@
-46,8
+46,6
@@
const char * const IMAGE_RENDERER("image");
const char * const N_PATCH_RENDERER("nPatch");
const char * const SVG_RENDERER("svg");
const char * const N_PATCH_RENDERER("nPatch");
const char * const SVG_RENDERER("svg");
-const std::string TEXTURE_UNIFORM_NAME = "sTexture";
-
const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
}
const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
}
@@
-423,7
+421,7
@@
void RendererFactory::CreateAtlasManager()
if( !mAtlasManager )
{
Shader shader = ImageRenderer::GetImageShader( *( mFactoryCache.Get() ) );
if( !mAtlasManager )
{
Shader shader = ImageRenderer::GetImageShader( *( mFactoryCache.Get() ) );
- mAtlasManager = new ImageAtlasManager(
shader, TEXTURE_UNIFORM_NAME
);
+ mAtlasManager = new ImageAtlasManager();
mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL );
}
}
mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL );
}
}