X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fdecorator%2Ftext-decorator.cpp;h=648c17a131acce2824f579b6c9e5f492e2566fb5;hb=refs%2Fchanges%2F03%2F251703%2F2;hp=7016759914a5b762a63049069031db6c77fc1268;hpb=98d143f42bcbff983cadb5caf0de67e8cc7528a4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp index 7016759..648c17a 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@ -34,37 +34,13 @@ #include #include #include +#include #ifdef DEBUG_ENABLED #define DECORATOR_DEBUG #endif -#define MAKE_SHADER(A)#A - -namespace -{ -const char* VERTEX_SHADER = MAKE_SHADER( -attribute mediump vec2 aPosition; -uniform highp mat4 uMvpMatrix; - -void main() -{ - mediump vec4 position = vec4( aPosition, 0.0, 1.0 ); - gl_Position = uMvpMatrix * position; -} -); - -const char* FRAGMENT_SHADER = MAKE_SHADER( -uniform lowp vec4 uColor; - -void main() -{ - gl_FragColor = uColor; -} -); -} - namespace Dali { namespace Internal @@ -270,7 +246,7 @@ struct Decorator::Impl : public ConnectionTracker mHidePrimaryCursorAndGrabHandle( false ) { mQuadVertexFormat[ "aPosition" ] = Property::VECTOR2; - mHighlightShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); + mHighlightShader = Shader::New( SHADER_TEXT_DECORATOR_SHADER_VERT, SHADER_TEXT_DECORATOR_SHADER_FRAG ); SetupGestures(); }