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 "Refactored Button and derived classes, moving state change and transition...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
shaders
/
text-bgra-shader.cpp
diff --git
a/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp
b/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp
index
7f2f2a5
..
5bf3707
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp
+++ b/
dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp
@@
-17,6
+17,7
@@
// INTERNAL HEADERS
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
// INTERNAL HEADERS
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
+#include <dali/public-api/shader-effects/shader-effect.h>
namespace Dali
{
namespace Dali
{
@@
-49,7
+50,6
@@
Dali::ShaderEffect New()
);
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New( vertexShader, fragmentShader,
);
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New( vertexShader, fragmentShader,
- Dali::GeometryType( Dali::GEOMETRY_TYPE_TEXTURED_MESH ),
Dali::ShaderEffect::GeometryHints( Dali::ShaderEffect::HINT_NONE ) );
return shaderEffect;
}
Dali::ShaderEffect::GeometryHints( Dali::ShaderEffect::HINT_NONE ) );
return shaderEffect;
}