X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller-impl.cpp;h=da5e2e7adbefd1ace18bd8a4ee7553c1b7bc0a03;hb=70510385d88cfbd5c232117d8436ca74c523e172;hp=6554a2c62fcd290045d8cdbc44c740e2a979974b;hpb=1bc80454daa9e30655e4c4dec1784f6e9e5f496a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp index 6554a2c..da5e2e7 100644 --- a/dali-toolkit/internal/text/text-controller-impl.cpp +++ b/dali-toolkit/internal/text/text-controller-impl.cpp @@ -35,6 +35,7 @@ #include #include #include +#include using namespace Dali; @@ -45,32 +46,6 @@ namespace Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS"); #endif -#define MAKE_SHADER(A)#A - -const char* VERTEX_SHADER_BACKGROUND = MAKE_SHADER( -attribute mediump vec2 aPosition; -attribute mediump vec4 aColor; -varying mediump vec4 vColor; -uniform highp mat4 uMvpMatrix; - -void main() -{ - mediump vec4 position = vec4( aPosition, 0.0, 1.0 ); - gl_Position = uMvpMatrix * position; - vColor = aColor; -} -); - -const char* FRAGMENT_SHADER_BACKGROUND = MAKE_SHADER( -varying mediump vec4 vColor; -uniform lowp vec4 uColor; - -void main() -{ - gl_FragColor = vColor * uColor; -} -); - struct BackgroundVertex { Vector2 mPosition; ///< Vertex posiiton @@ -2108,7 +2083,7 @@ Actor Controller::Impl::CreateBackgroundActor() if( !mShaderBackground ) { - mShaderBackground = Shader::New( VERTEX_SHADER_BACKGROUND, FRAGMENT_SHADER_BACKGROUND ); + mShaderBackground = Shader::New( SHADER_TEXT_CONTROLLER_BACKGROUND_SHADER_VERT, SHADER_TEXT_CONTROLLER_BACKGROUND_SHADER_FRAG ); } Dali::Renderer renderer = Dali::Renderer::New( quadGeometry, mShaderBackground );