X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fperf-scroll%2Fperf-scroll.cpp;h=dc6cdc8f36b056915a69acb206c1d3b288f77226;hb=422d91612187d1a575b3ed00f7d33cb2d19e02ed;hp=798194a87e918fee57cab0f718d50853b2988488;hpb=1b19fd140ff139b5854a1a62447faf31b175d8f6;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp index 798194a..dc6cdc8 100644 --- a/examples/perf-scroll/perf-scroll.cpp +++ b/examples/perf-scroll/perf-scroll.cpp @@ -18,6 +18,8 @@ #include #include #include "shared/utility.h" +#include "generated/perf-scroll-vert.h" +#include "generated/perf-scroll-frag.h" using namespace Dali; using namespace Dali::Toolkit; @@ -147,35 +149,6 @@ struct VertexWithTexture Vector2 texCoord; }; -// clang-format off - -const char* VERTEX_SHADER_TEXTURE = DALI_COMPOSE_SHADER( - attribute mediump vec2 aPosition;\n - attribute mediump vec2 aTexCoord;\n - uniform mediump mat4 uMvpMatrix;\n - uniform mediump vec3 uSize;\n - varying mediump vec2 vTexCoord;\n - void main()\n - {\n - vec4 position = vec4(aPosition,0.0,1.0)*vec4(uSize,1.0);\n - gl_Position = uMvpMatrix * position;\n - vTexCoord = aTexCoord;\n - }\n -); - -const char* FRAGMENT_SHADER_TEXTURE = DALI_COMPOSE_SHADER( - uniform lowp vec4 uColor;\n - uniform sampler2D sTexture;\n - varying mediump vec2 vTexCoord;\n - - void main()\n - {\n - gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n - }\n -); - -// clang-format on - bool gUseMesh(false); bool gNinePatch(false); unsigned int gRowsPerPage(15); @@ -294,7 +267,7 @@ public: //Create all the renderers std::vector renderers(numImages); - Shader shader = Shader::New(VERTEX_SHADER_TEXTURE, FRAGMENT_SHADER_TEXTURE); + Shader shader = Shader::New(SHADER_PERF_SCROLL_VERT, SHADER_PERF_SCROLL_FRAG); Geometry geometry = DemoHelper::CreateTexturedQuad(); for(unsigned int i(0); i < numImages; ++i) {