From e324f0d5d9a4b79295501d98e0990a5203afc8bb Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 24 Mar 2014 19:01:03 +0000 Subject: [PATCH] (RenderTasks) Fixed test cases for chained framebuffers [Issue#] N/A [Problem] Test case failed after previous update [Cause] Not enough care and attention [Solution] Updated the test case to show that the framebuffer gets drawn [Verification] Build Repo Signed-off-by: David Steele --- .../dali-test-suite/render-tasks/utc-Dali-RenderTask.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/automated-tests/dali-test-suite/render-tasks/utc-Dali-RenderTask.cpp b/automated-tests/dali-test-suite/render-tasks/utc-Dali-RenderTask.cpp index 0b8c8b6..cdd7be4 100644 --- a/automated-tests/dali-test-suite/render-tasks/utc-Dali-RenderTask.cpp +++ b/automated-tests/dali-test-suite/render-tasks/utc-Dali-RenderTask.cpp @@ -2690,7 +2690,6 @@ static void UtcDaliRenderTaskOnceNoSync08() } - static void UtcDaliRenderTaskOnceChain01() { TestApplication application; @@ -2727,6 +2726,7 @@ static void UtcDaliRenderTaskOnceChain01() FrameBufferImage fbo = firstTask.GetTargetFrameBuffer(); ImageActor secondRootActor = ImageActor::New( fbo ); Stage::GetCurrent().Add(secondRootActor); + RenderTask secondTask = CreateRenderTask(application, offscreenCameraActor, defaultRootActor, secondRootActor, RenderTask::REFRESH_ONCE, offscreenFramebufferId, false); bool secondFinished = false; RenderTaskFinished renderTask2Finished( secondFinished ); @@ -2735,14 +2735,16 @@ static void UtcDaliRenderTaskOnceChain01() application.SendNotification(); // START PROCESS/RENDER Input, Expected Input, Expected - DALI_TEST_CHECK( UpdateRender(application, drawTrace, false, firstFinished, false ) ); + DALI_TEST_CHECK( UpdateRender(application, drawTrace, true, firstFinished, false ) ); DALI_TEST_CHECK( secondFinished == false ); - DALI_TEST_CHECK( UpdateRender(application, drawTrace, false, firstFinished, false ) ); + DALI_TEST_CHECK( UpdateRender(application, drawTrace, true, firstFinished, false ) ); DALI_TEST_CHECK( secondFinished == false ); CompleteImageLoad(application, imageRequestId, imageType); // Need to run update again for this to complete DALI_TEST_CHECK( UpdateRender(application, drawTrace, true, firstFinished, false ) ); DALI_TEST_CHECK( secondFinished == false ); + application.GetPlatform().ClearReadyResources(); + DALI_TEST_CHECK( UpdateRender(application, drawTrace, false, firstFinished, true ) ); DALI_TEST_CHECK( secondFinished == true ); @@ -2755,7 +2757,6 @@ static void UtcDaliRenderTaskOnceChain01() DALI_TEST_CHECK( secondFinished == false ); DALI_TEST_CHECK( UpdateRender(application, drawTrace, false, firstFinished, false ) ); DALI_TEST_CHECK( secondFinished == false ); - } void UtcDaliRenderTaskProperties() -- 2.7.4