[UTC/ITC][dali-core][Non-ACR][Fix Asynchronous Set/Get Timing error of RenderTask]

Change-Id: I2e4e0acef9ab97303d4d62351fdff2cad9cc7a3e
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>

diff --git a/src/itc/dali-core/render-task/ITs-render-task-common.h b/src/itc/dali-core/render-task/ITs-render-task-common.h
index ba62649aa86b23394fe0fd30d00930701f997eb4..96be54c216fd9fdd2e728bdc494bd69e2551d8fc 100755 (executable)
--- a/src/itc/dali-core/render-task/ITs-render-task-common.h
+++ b/src/itc/dali-core/render-task/ITs-render-task-common.h
@@ -26,6 +26,7 @@ using namespace Toolkit;
 #define START_POINT 0
 #define RENDER_TASK_INTERVAL 16
 #define WAIT_TIME 10
+#define RENDER_DELAY_TIME  1000u
 
 typedef unsigned int GLuint;
 extern const char* COMPOSITE_FRAGMENT_SOURCE;

diff --git a/src/itc/dali-core/render-task/ITs-render-task.cpp b/src/itc/dali-core/render-task/ITs-render-task.cpp
index 19e52b7f400d974428eef679f71d097fde97eebe..c7bc6479274cc4d1e17c4de800a827474feb82f2 100755 (executable)
--- a/src/itc/dali-core/render-task/ITs-render-task.cpp
+++ b/src/itc/dali-core/render-task/ITs-render-task.cpp
@@ -4,6 +4,8 @@ extern int gArgc;
 extern char ** gArgv;
 extern int test_return_value;
 
+unsigned int g_uDelayedInterVal = INTERVAL;
+
 /** @addtogroup itc-dali-core
 *      @brief Integrated testsuites for module dali-core
 *      @ingroup itc
@@ -75,7 +77,7 @@ namespace
                {
                        mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
                        ExcuteTest();
-                       mTimer = Timer::New( INTERVAL );
+                       mTimer = Timer::New( g_uDelayedInterVal );
                        mTimer.TickSignal().Connect( this, &TestApp::Tick );
                        mTimer.Start();
                }
@@ -103,6 +105,7 @@ namespace
                        {
                                case RENDER_TASK_SETGETVIEWPORTSIZE: 
                                RenderTaskSetGetViewportSize();
+                               g_uDelayedInterVal = RENDER_DELAY_TIME;
                                break;
 
                                case RENDER_TASK_SETGETCULLMODE: 
@@ -139,10 +142,12 @@ namespace
 
                                case RENDER_TASK_SETGETVIEWPORTPOSITION: 
                                RenderTaskSetGetViewportPosition();
+                               g_uDelayedInterVal = RENDER_DELAY_TIME;
                                break;
 
                                case RENDER_TASK_SETGETVIEWPORT: 
                                RenderTaskSetAndGetViewport();
+                               g_uDelayedInterVal = RENDER_DELAY_TIME;
                                break;
 
                                case RENDER_TASK_SETGETTARGETFRAMEBUFFER: 

diff --git a/src/utc/dali-core/render-task/utc-dali-render-task-common.h b/src/utc/dali-core/render-task/utc-dali-render-task-common.h
index faae413e7b2cd4796fa172000fd23d286d145cbc..9c90f5daebda156c511205c7c034226b8f4df868 100755 (executable)
--- a/src/utc/dali-core/render-task/utc-dali-render-task-common.h
+++ b/src/utc/dali-core/render-task/utc-dali-render-task-common.h
@@ -15,6 +15,7 @@ using namespace Toolkit;
 #define START_POINT 0
 #define RENDER_TASK_INTERVAL 16
 #define WAIT_TIME 10
+#define RENDER_DELAY_TIME  1000u
 
 typedef unsigned int GLuint;
 extern const char* COMPOSITE_FRAGMENT_SOURCE;

diff --git a/src/utc/dali-core/render-task/utc-dali-render-task.cpp b/src/utc/dali-core/render-task/utc-dali-render-task.cpp
index b70dc46c38b2fda26074c4532ec040b2e0642b0e..68413e3762ced431f3c6d8893ccbccc08d17edf6 100755 (executable)
--- a/src/utc/dali-core/render-task/utc-dali-render-task.cpp
+++ b/src/utc/dali-core/render-task/utc-dali-render-task.cpp
@@ -4,6 +4,7 @@ extern int gArgc;
 extern char ** gArgv;
 extern int test_return_value;
 
+unsigned int gDelayedInterVal = INTERVAL;
 
 //& set: Rendertask
 
@@ -86,7 +87,7 @@ namespace
       mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
 
       ExcuteTest();
-      mTimer = Timer::New( INTERVAL );
+      mTimer = Timer::New( gDelayedInterVal );
       mTimer.TickSignal().Connect( this, &TestApp::Tick );
       mTimer.Start();
     }
@@ -114,6 +115,7 @@ namespace
       {
         case RENDER_TASK_SETGETVIEWPORTSIZE_P:
           RenderTaskSetGetViewportSizeP();
+          gDelayedInterVal = RENDER_DELAY_TIME;
           break;
 
         case RENDER_TASK_SETGETCULLMODE_P:
@@ -186,10 +188,12 @@ namespace
 
         case RENDER_TASK_SETGETVIEWPORTPOSITION_P:
           RenderTaskSetGetViewportPositionP();
+          gDelayedInterVal = RENDER_DELAY_TIME;
           break;
 
         case RENDER_TASK_SETGETVIEWPORT_P:
           RenderTaskSetAndGetViewportP();
+          gDelayedInterVal = RENDER_DELAY_TIME;
           break;
 
         case RENDER_TASK_SETVIEWPORT_N: