projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused Retention policy
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-application.cpp
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
6e41c42
..
f5d670d
100644
(file)
--- 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) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,15
+26,14
@@
TestApplication::TestApplication( uint32_t surfaceWidth,
uint32_t surfaceHeight,
uint32_t horizontalDpi,
uint32_t verticalDpi,
uint32_t surfaceHeight,
uint32_t horizontalDpi,
uint32_t verticalDpi,
- ResourcePolicy::DataRetention policy,
bool initialize )
bool initialize )
-: mCore( NULL ),
+: mRenderSurface( NULL ),
+ mCore( NULL ),
mSurfaceWidth( surfaceWidth ),
mSurfaceHeight( surfaceHeight ),
mFrame( 0u ),
mDpi{ horizontalDpi, verticalDpi },
mSurfaceWidth( surfaceWidth ),
mSurfaceHeight( surfaceHeight ),
mFrame( 0u ),
mDpi{ horizontalDpi, verticalDpi },
- mLastVSyncTime(0u),
- mDataRetentionPolicy( policy )
+ mLastVSyncTime(0u)
{
if( initialize )
{
{
if( initialize )
{
@@
-59,7
+58,6
@@
void TestApplication::CreateCore()
mGlAbstraction,
mGlSyncAbstraction,
mGlContextHelperAbstraction,
mGlAbstraction,
mGlSyncAbstraction,
mGlContextHelperAbstraction,
- mDataRetentionPolicy,
Integration::RenderToFrameBuffer::FALSE,
Integration::DepthBufferAvailable::TRUE,
Integration::StencilBufferAvailable::TRUE );
Integration::RenderToFrameBuffer::FALSE,
Integration::DepthBufferAvailable::TRUE,
Integration::StencilBufferAvailable::TRUE );
@@
-78,11
+76,8
@@
void TestApplication::CreateCore()
void TestApplication::CreateScene()
{
mRenderSurface = new TestRenderSurface( Dali::PositionSize( 0, 0, mSurfaceWidth, mSurfaceHeight ) );
void TestApplication::CreateScene()
{
mRenderSurface = new TestRenderSurface( Dali::PositionSize( 0, 0, mSurfaceWidth, mSurfaceHeight ) );
- mScene = Dali::Integration::Scene::New( Vector2( static_cast<float>( mSurfaceWidth ), static_cast<float>( mSurfaceHeight ) ) );
- mScene.SetSurface( *mRenderSurface );
+ mScene = Dali::Integration::Scene::New( *mRenderSurface );
mScene.SetDpi( Vector2( static_cast<float>( mDpi.x ), static_cast<float>( mDpi.y ) ) );
mScene.SetDpi( Vector2( static_cast<float>( mDpi.x ), static_cast<float>( mDpi.y ) ) );
-
- mCore->SurfaceResized( mRenderSurface );
}
void TestApplication::InitializeCore()
}
void TestApplication::InitializeCore()
@@
-195,7
+190,7
@@
void TestApplication::DoUpdate( uint32_t intervalMilliseconds, const char* locat
bool TestApplication::Render( uint32_t intervalMilliseconds, const char* location )
{
DoUpdate( intervalMilliseconds, location );
bool TestApplication::Render( uint32_t intervalMilliseconds, const char* location )
{
DoUpdate( intervalMilliseconds, location );
- mCore->Render( mRenderStatus, false );
+ mCore->Render( mRenderStatus, false
/*do not force clear*/, false /*do not skip rendering*/
);
mFrame++;
mFrame++;
@@
-221,7
+216,7
@@
bool TestApplication::GetRenderNeedsUpdate()
bool TestApplication::RenderOnly( )
{
// Update Time values
bool TestApplication::RenderOnly( )
{
// Update Time values
- mCore->Render( mRenderStatus, false );
+ mCore->Render( mRenderStatus, false
/*do not force clear*/, false /*do not skip rendering*/
);
mFrame++;
mFrame++;