common taskscheduler: revise functionalities.

[platform/core/graphics/tizenvg.git] / test / testStroke.cpp

diff --git a/test/testStroke.cpp b/test/testStroke.cpp
index 493bbde..5ac2265 100644 (file)
--- a/test/testStroke.cpp
+++ b/test/testStroke.cpp
@@ -6,35 +6,37 @@
 
 void tvgDrawCmds(tvg::Canvas* canvas)
 {
+    if (!canvas) return;
+
     //Shape 1
     auto shape1 = tvg::Shape::gen();
-    shape1->appendRect(50, 50, 200, 200, 0);
+    shape1->appendRect(50, 50, 200, 200, 0, 0);
     shape1->fill(50, 50, 50, 255);
     shape1->stroke(255, 255, 255, 255);       //color: r, g, b, a
     shape1->stroke(tvg::StrokeJoin::Bevel);   //default is Bevel
     shape1->stroke(10);                       //width: 10px
 
-    canvas->push(move(shape1));
+    if (canvas->push(move(shape1)) != tvg::Result::Success) return;
 
     //Shape 2
     auto shape2 = tvg::Shape::gen();
-    shape2->appendRect(300, 50, 200, 200, 0);
+    shape2->appendRect(300, 50, 200, 200, 0, 0);
     shape2->fill(50, 50, 50, 255);
     shape2->stroke(255, 255, 255, 255);
     shape2->stroke(tvg::StrokeJoin::Round);
     shape2->stroke(10);
 
-    canvas->push(move(shape2));
+    if (canvas->push(move(shape2)) != tvg::Result::Success) return;
 
     //Shape 3
     auto shape3 = tvg::Shape::gen();
-    shape3->appendRect(550, 50, 200, 200, 0);
+    shape3->appendRect(550, 50, 200, 200, 0, 0);
     shape3->fill(50, 50, 50, 255);
     shape3->stroke(255, 255, 255, 255);
     shape3->stroke(tvg::StrokeJoin::Miter);
     shape3->stroke(10);
 
-    canvas->push(move(shape3));
+    if (canvas->push(move(shape3)) != tvg::Result::Success) return;
 
     //Shape 4
     auto shape4 = tvg::Shape::gen();
@@ -43,7 +45,7 @@ void tvgDrawCmds(tvg::Canvas* canvas)
     shape4->stroke(255, 255, 255, 255);
     shape4->stroke(1);
 
-    canvas->push(move(shape4));
+    if (canvas->push(move(shape4)) != tvg::Result::Success) return;
 
     //Shape 5
     auto shape5 = tvg::Shape::gen();
@@ -52,7 +54,7 @@ void tvgDrawCmds(tvg::Canvas* canvas)
     shape5->stroke(255, 255, 255, 255);
     shape5->stroke(2);
 
-    canvas->push(move(shape5));
+    if (canvas->push(move(shape5)) != tvg::Result::Success) return;
 
     //Shape 6
     auto shape6 = tvg::Shape::gen();
@@ -61,7 +63,7 @@ void tvgDrawCmds(tvg::Canvas* canvas)
     shape6->stroke(255, 255, 255, 255);
     shape6->stroke(4);
 
-    canvas->push(move(shape6));
+    if (canvas->push(move(shape6)) != tvg::Result::Success) return;
 }
 
 
@@ -75,7 +77,7 @@ void tvgSwTest(uint32_t* buffer)
 {
     //Create a Canvas
     swCanvas = tvg::SwCanvas::gen();
-    swCanvas->target(buffer, WIDTH, WIDTH, HEIGHT);
+    swCanvas->target(buffer, WIDTH, WIDTH, HEIGHT, tvg::SwCanvas::ARGB8888);
 
     /* Push the shape into the Canvas drawing list
        When this shape is into the canvas list, the shape could update & prepare
@@ -86,8 +88,9 @@ void tvgSwTest(uint32_t* buffer)
 
 void drawSwView(void* data, Eo* obj)
 {
-    swCanvas->draw();
-    swCanvas->sync();
+    if (swCanvas->draw() == tvg::Result::Success) {
+        swCanvas->sync();
+    }
 }
 
 
@@ -115,17 +118,12 @@ void initGLview(Evas_Object *obj)
 void drawGLview(Evas_Object *obj)
 {
     auto gl = elm_glview_gl_api_get(obj);
-    int w, h;
-    elm_glview_size_get(obj, &w, &h);
-    gl->glViewport(0, 0, w, h);
     gl->glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     gl->glClear(GL_COLOR_BUFFER_BIT);
-    gl->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    gl->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
-    gl->glEnable(GL_BLEND);
 
-    glCanvas->draw();
-    glCanvas->sync();
+    if (glCanvas->draw() == tvg::Result::Success) {
+        glCanvas->sync();
+    }
 }
 
 
@@ -148,22 +146,28 @@ int main(int argc, char **argv)
         cout << "tvg engine: opengl" << endl;
     }
 
+    //Threads Count
+    auto threads = std::thread::hardware_concurrency();
+
     //Initialize ThorVG Engine
-    tvg::Initializer::init(tvgEngine);
+    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
 
-    elm_init(argc, argv);
+        elm_init(argc, argv);
 
-    elm_config_accel_preference_set("gl");
+        if (tvgEngine == tvg::CanvasEngine::Sw) {
+            createSwView();
+        } else {
+            createGlView();
+        }
 
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        createSwView();
-    } else {
-        createGlView();
-    }
+        elm_run();
+        elm_shutdown();
 
-    elm_run();
-    elm_shutdown();
+        //Terminate ThorVG Engine
+        tvg::Initializer::term(tvgEngine);
 
-    //Terminate ThorVG Engine
-    tvg::Initializer::term(tvgEngine);
-}
\ No newline at end of file
+    } else {
+        cout << "engine is not supported" << endl;
+    }
+    return 0;
+}