gl_engine: Fix crash in animation callback. Refactor test samples draw function....

Change-Id: I9ca2cb3951f2229f36292b69221451e0eaf5b6a1

diff --git a/src/lib/gl_engine/tvgGlGeometry.cpp b/src/lib/gl_engine/tvgGlGeometry.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 59b730b..eba6fbf
--- a/src/lib/gl_engine/tvgGlGeometry.cpp
+++ b/src/lib/gl_engine/tvgGlGeometry.cpp
@@ -84,11 +84,11 @@ bool GlGeometry::generateAAPoints(const Shape &shape, float strokeWd, RenderUpda
 
         size_t fPoint = 0;
         size_t sPoint = 1;
-        for (size_t i = 0; i < nPoints - 1; ++i)
+        for (size_t i = 0; i < nPoints; ++i)
         {
             fPoint = i;
             sPoint = i + 1;
-            if (sPoint == nPoints - 1)
+            if (fPoint == nPoints - 1)
                 sPoint = 0;
 
             GlPoint normal = getNormal(aaPts[fPoint].orgPt, aaPts[sPoint].orgPt);
@@ -96,8 +96,8 @@ bool GlGeometry::generateAAPoints(const Shape &shape, float strokeWd, RenderUpda
             normalInfo[fPoint].normal1 = normal;
             normalInfo[sPoint].normal2 = normal;
         }
-        normalInfo[nPoints - 1].normal1 = normalInfo[0].normal1;
-        normalInfo[nPoints - 1].normal2 = normalInfo[0].normal2;
+        normalInfo[0].normal2 = normalInfo[0].normal1;
+        normalInfo[nPoints - 1].normal1 = normalInfo[nPoints - 1].normal2;
 
         for (uint32_t i = 0; i < nPoints; ++i)
         {

diff --git a/src/lib/gl_engine/tvgGlRenderer.cpp b/src/lib/gl_engine/tvgGlRenderer.cpp
old mode 100644 (file)
new mode 100755 (executable)
index bef3871..d9acf61
--- a/src/lib/gl_engine/tvgGlRenderer.cpp
+++ b/src/lib/gl_engine/tvgGlRenderer.cpp
@@ -64,8 +64,9 @@ bool GlRenderer::flush()
 
 bool GlRenderer::preRender()
 {
-    //TODO: called just before render()
-
+    // Blend function for pre multiplied alpha
+    GL_CHECK(glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA));
+    GL_CHECK(glEnable(GL_BLEND));
     return true;
 }
 

diff --git a/test/testAsync.cpp b/test/testAsync.cpp
old mode 100644 (file)
new mode 100755 (executable)
index df81020..4530f1d
--- a/test/testAsync.cpp
+++ b/test/testAsync.cpp
@@ -113,14 +113,8 @@ 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->sync();
 }

diff --git a/test/testBlending.cpp b/test/testBlending.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 6765cb6..7db8201
--- a/test/testBlending.cpp
+++ b/test/testBlending.cpp
@@ -101,14 +101,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testBoundary.cpp b/test/testBoundary.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 71dd6a0..a2bb1d8
--- a/test/testBoundary.cpp
+++ b/test/testBoundary.cpp
@@ -90,14 +90,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testCustomTransform.cpp b/test/testCustomTransform.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 5945490..00a3bc3
--- a/test/testCustomTransform.cpp
+++ b/test/testCustomTransform.cpp
@@ -139,14 +139,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testDirectUpdate.cpp b/test/testDirectUpdate.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 67d0240..164ff61
--- a/test/testDirectUpdate.cpp
+++ b/test/testDirectUpdate.cpp
@@ -102,14 +102,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testGradientTransform.cpp b/test/testGradientTransform.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 1c1b820..a97ec70
--- a/test/testGradientTransform.cpp
+++ b/test/testGradientTransform.cpp
@@ -167,14 +167,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testLinearGradient.cpp b/test/testLinearGradient.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 826287b..90656fc
--- a/test/testLinearGradient.cpp
+++ b/test/testLinearGradient.cpp
@@ -119,14 +119,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testMultiShapes.cpp b/test/testMultiShapes.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8860135..d81f709
--- a/test/testMultiShapes.cpp
+++ b/test/testMultiShapes.cpp
@@ -79,14 +79,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testPath.cpp b/test/testPath.cpp
old mode 100644 (file)
new mode 100755 (executable)
index bcd5ab7..b3a265e
--- a/test/testPath.cpp
+++ b/test/testPath.cpp
@@ -96,14 +96,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testPathCopy.cpp b/test/testPathCopy.cpp
old mode 100644 (file)
new mode 100755 (executable)
index dd00827..724b8b4
--- a/test/testPathCopy.cpp
+++ b/test/testPathCopy.cpp
@@ -133,14 +133,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testRadialGradient.cpp b/test/testRadialGradient.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 054bf12..c80cb03
--- a/test/testRadialGradient.cpp
+++ b/test/testRadialGradient.cpp
@@ -119,14 +119,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testScene.cpp b/test/testScene.cpp
old mode 100644 (file)
new mode 100755 (executable)
index b796a5b..c835a92
--- a/test/testScene.cpp
+++ b/test/testScene.cpp
@@ -126,14 +126,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testSceneTransform.cpp b/test/testSceneTransform.cpp
old mode 100644 (file)
new mode 100755 (executable)
index aeaf11e..9597101
--- a/test/testSceneTransform.cpp
+++ b/test/testSceneTransform.cpp
@@ -163,14 +163,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testShape.cpp b/test/testShape.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 391b55f..7788817
--- a/test/testShape.cpp
+++ b/test/testShape.cpp
@@ -69,14 +69,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testStroke.cpp b/test/testStroke.cpp
old mode 100644 (file)
new mode 100755 (executable)
index f7c1a88..36f2a94
--- a/test/testStroke.cpp
+++ b/test/testStroke.cpp
@@ -116,14 +116,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testStrokeLine.cpp b/test/testStrokeLine.cpp
old mode 100644 (file)
new mode 100755 (executable)
index bc3f960..894c695
--- a/test/testStrokeLine.cpp
+++ b/test/testStrokeLine.cpp
@@ -153,14 +153,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testSvg.cpp b/test/testSvg.cpp
old mode 100644 (file)
new mode 100755 (executable)
index edb987b..65fe9d7
--- a/test/testSvg.cpp
+++ b/test/testSvg.cpp
@@ -93,14 +93,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testTransform.cpp b/test/testTransform.cpp
old mode 100644 (file)
new mode 100755 (executable)
index da7c87c..6d0edbf
--- a/test/testTransform.cpp
+++ b/test/testTransform.cpp
@@ -130,14 +130,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();

diff --git a/test/testUpdate.cpp b/test/testUpdate.cpp
old mode 100644 (file)
new mode 100755 (executable)
index c350435..0d00738
--- a/test/testUpdate.cpp
+++ b/test/testUpdate.cpp
@@ -91,14 +91,8 @@ 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);
 
     if (glCanvas->draw() == tvg::Result::Success) {
         glCanvas->sync();