X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-application.cpp;h=6075c8fac48657828e8fc989cf2bed146ee8484a;hp=b2a3fb989e23e5bc062e24ea6e8732d3c84e3971;hb=dc96b027c0d06fae091bde3f877b32a379ca2894;hpb=73fdf4933699f5791443149da26e20681ed041cd diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp index b2a3fb9..6075c8f 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,24 +19,23 @@ namespace Dali { - bool TestApplication::mLoggingEnabled = true; -TestApplication::TestApplication( uint32_t surfaceWidth, - uint32_t surfaceHeight, - uint32_t horizontalDpi, - uint32_t verticalDpi, - bool initialize, - bool enablePartialUpdate ) -: mCore( NULL ), - mSurfaceWidth( surfaceWidth ), - mSurfaceHeight( surfaceHeight ), - mFrame( 0u ), - mDpi{ horizontalDpi, verticalDpi }, +TestApplication::TestApplication(uint32_t surfaceWidth, + uint32_t surfaceHeight, + uint32_t horizontalDpi, + uint32_t verticalDpi, + bool initialize, + bool enablePartialUpdate) +: mCore(NULL), + mSurfaceWidth(surfaceWidth), + mSurfaceHeight(surfaceHeight), + mFrame(0u), + mDpi{horizontalDpi, verticalDpi}, mLastVSyncTime(0u), mPartialUpdateEnabled(enablePartialUpdate) { - if( initialize ) + if(initialize) { Initialize(); } @@ -54,15 +53,13 @@ void TestApplication::CreateCore() // We always need the first update! mStatus.keepUpdating = Integration::KeepUpdating::STAGE_KEEP_RENDERING; - mCore = Dali::Integration::Core::New( mRenderController, - mPlatformAbstraction, - mGlAbstraction, - mGlSyncAbstraction, - mGlContextHelperAbstraction, - Integration::RenderToFrameBuffer::FALSE, - Integration::DepthBufferAvailable::TRUE, - Integration::StencilBufferAvailable::TRUE, - mPartialUpdateEnabled ? Integration::PartialUpdateAvailable::TRUE : Integration::PartialUpdateAvailable::FALSE ); + mCore = Dali::Integration::Core::New(mRenderController, + mPlatformAbstraction, + mGraphicsController, + Integration::RenderToFrameBuffer::FALSE, + Integration::DepthBufferAvailable::TRUE, + Integration::StencilBufferAvailable::TRUE, + mPartialUpdateEnabled ? Integration::PartialUpdateAvailable::TRUE : Integration::PartialUpdateAvailable::FALSE); mCore->ContextCreated(); @@ -70,15 +67,21 @@ void TestApplication::CreateCore() Dali::Integration::Log::InstallLogFunction(logFunction); Dali::Integration::Trace::LogContextFunction logContextFunction(&TestApplication::LogContext); - Dali::Integration::Trace::InstallLogContextFunction( logContextFunction ); + Dali::Integration::Trace::InstallLogContextFunction(logContextFunction); - Dali::Integration::Trace::LogContext( true, "Test" ); + Dali::Integration::Trace::LogContext(true, "Test"); } void TestApplication::CreateScene() { - mScene = Dali::Integration::Scene::New( Size( static_cast( mSurfaceWidth ), static_cast( mSurfaceHeight ) ) ); - mScene.SetDpi( Vector2( static_cast( mDpi.x ), static_cast( mDpi.y ) ) ); + mScene = Dali::Integration::Scene::New(Size(static_cast(mSurfaceWidth), static_cast(mSurfaceHeight))); + mScene.SetDpi(Vector2(static_cast(mDpi.x), static_cast(mDpi.y))); + + // Create render target for the scene + Graphics::RenderTargetCreateInfo rtInfo{}; + rtInfo.SetExtent({mSurfaceWidth, mSurfaceHeight}); + mRenderTarget = mGraphicsController.CreateRenderTarget(rtInfo, nullptr); + mScene.SetSurfaceRenderTarget(mRenderTarget.get()); } void TestApplication::InitializeCore() @@ -93,9 +96,9 @@ TestApplication::~TestApplication() delete mCore; } -void TestApplication::LogContext( bool start, const char* tag ) +void TestApplication::LogContext(bool start, const char* tag) { - if( start ) + if(start) { fprintf(stderr, "INFO: Trace Start: %s\n", tag); } @@ -107,7 +110,7 @@ void TestApplication::LogContext( bool start, const char* tag ) void TestApplication::LogMessage(Dali::Integration::Log::DebugPriority level, std::string& message) { - if( mLoggingEnabled ) + if(mLoggingEnabled) { switch(level) { @@ -142,19 +145,24 @@ TestRenderController& TestApplication::GetRenderController() return mRenderController; } +TestGraphicsController& TestApplication::GetGraphicsController() +{ + return mGraphicsController; +} + TestGlAbstraction& TestApplication::GetGlAbstraction() { - return mGlAbstraction; + return static_cast(mGraphicsController.GetGlAbstraction()); } TestGlSyncAbstraction& TestApplication::GetGlSyncAbstraction() { - return mGlSyncAbstraction; + return static_cast(mGraphicsController.GetGlSyncAbstraction()); } TestGlContextHelperAbstraction& TestApplication::GetGlContextHelperAbstraction() { - return mGlContextHelperAbstraction; + return static_cast(mGraphicsController.GetGlContextHelperAbstraction()); } void TestApplication::ProcessEvent(const Integration::Event& event) @@ -168,37 +176,37 @@ void TestApplication::SendNotification() mCore->ProcessEvents(); } -void TestApplication::DoUpdate( uint32_t intervalMilliseconds, const char* location ) +void TestApplication::DoUpdate(uint32_t intervalMilliseconds, const char* location) { - if( GetUpdateStatus() == 0 && - mRenderStatus.NeedsUpdate() == false && - ! GetRenderController().WasCalled(TestRenderController::RequestUpdateFunc) ) + if(GetUpdateStatus() == 0 && + mRenderStatus.NeedsUpdate() == false && + !GetRenderController().WasCalled(TestRenderController::RequestUpdateFunc)) { - fprintf(stderr, "WARNING - Update not required :%s\n", location==NULL?"NULL":location); + fprintf(stderr, "WARNING - Update not required :%s\n", location == NULL ? "NULL" : location); } - uint32_t nextVSyncTime = mLastVSyncTime + intervalMilliseconds; - float elapsedSeconds = static_cast( intervalMilliseconds ) * 0.001f; + uint32_t nextVSyncTime = mLastVSyncTime + intervalMilliseconds; + float elapsedSeconds = static_cast(intervalMilliseconds) * 0.001f; - mCore->Update( elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus, false, false ); + mCore->Update(elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus, false, false); GetRenderController().Initialize(); mLastVSyncTime = nextVSyncTime; } -bool TestApplication::Render( uint32_t intervalMilliseconds, const char* location ) +bool TestApplication::Render(uint32_t intervalMilliseconds, const char* location) { - DoUpdate( intervalMilliseconds, location ); + DoUpdate(intervalMilliseconds, location); // Reset the status - mRenderStatus.SetNeedsUpdate( false ); - mRenderStatus.SetNeedsPostRender( false ); + mRenderStatus.SetNeedsUpdate(false); + mRenderStatus.SetNeedsPostRender(false); - mCore->PreRender( mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/ ); - mCore->RenderScene( mRenderStatus, mScene, true /*render the off-screen buffers*/ ); - mCore->RenderScene( mRenderStatus, mScene, false /*render the surface*/ ); - mCore->PostRender( false /*do not skip rendering*/ ); + mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/); + mCore->RenderScene(mRenderStatus, mScene, true /*render the off-screen buffers*/); + mCore->RenderScene(mRenderStatus, mScene, false /*render the surface*/); + mCore->PostRender(false /*do not skip rendering*/); mFrame++; @@ -209,7 +217,7 @@ bool TestApplication::PreRenderWithPartialUpdate(uint32_t intervalMilliseconds, { DoUpdate(intervalMilliseconds, location); - mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/ ); + mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/); mCore->PreRender(mScene, damagedRects); return mStatus.KeepUpdating() || mRenderStatus.NeedsUpdate(); @@ -231,9 +239,9 @@ uint32_t TestApplication::GetUpdateStatus() return mStatus.KeepUpdating(); } -bool TestApplication::UpdateOnly( uint32_t intervalMilliseconds ) +bool TestApplication::UpdateOnly(uint32_t intervalMilliseconds) { - DoUpdate( intervalMilliseconds ); + DoUpdate(intervalMilliseconds); return mStatus.KeepUpdating(); } @@ -247,13 +255,13 @@ bool TestApplication::GetRenderNeedsPostRender() return mRenderStatus.NeedsPostRender(); } -bool TestApplication::RenderOnly( ) +bool TestApplication::RenderOnly() { // Update Time values - mCore->PreRender( mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/ ); - mCore->RenderScene( mRenderStatus, mScene, true /*render the off-screen buffers*/ ); - mCore->RenderScene( mRenderStatus, mScene, false /*render the surface*/ ); - mCore->PostRender( false /*do not skip rendering*/ ); + mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/); + mCore->RenderScene(mRenderStatus, mScene, true /*render the off-screen buffers*/); + mCore->RenderScene(mRenderStatus, mScene, false /*render the surface*/); + mCore->PostRender(false /*do not skip rendering*/); mFrame++; @@ -263,15 +271,15 @@ bool TestApplication::RenderOnly( ) void TestApplication::ResetContext() { mCore->ContextDestroyed(); - mGlAbstraction.Initialize(); + mGraphicsController.Initialize(); mCore->ContextCreated(); } -uint32_t TestApplication::Wait( uint32_t durationToWait ) +uint32_t TestApplication::Wait(uint32_t durationToWait) { int time = 0; - for(uint32_t i = 0; i <= ( durationToWait / RENDER_FRAME_INTERVAL); i++) + for(uint32_t i = 0; i <= (durationToWait / RENDER_FRAME_INTERVAL); i++) { SendNotification(); Render(RENDER_FRAME_INTERVAL); @@ -280,4 +288,4 @@ uint32_t TestApplication::Wait( uint32_t durationToWait ) return time; } -} // Namespace dali +} // namespace Dali