Peter M. Groen / dali-demo

Commit 2d5e2b5665b8359f5b389736d18c9a7b7c412fd9

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents f8cea26e 97f8c432

Merge "Remove batching from homescreen benchmark." into devel/master

Inline Side-by-side
Showing 1 changed file with 1 additions and 17 deletions
examples/homescreen-benchmark/homescreen-benchmark.cpp
  View file @2d5e2b5
@@ -49,7 +49,6 @@ const float DEFAULT_OPT_ROW_COUNT ( 5 ); @@ -49,7 +49,6 @@ const float DEFAULT_OPT_ROW_COUNT ( 5 );
49 const float DEFAULT_OPT_COL_COUNT ( 4 ); 49 const float DEFAULT_OPT_COL_COUNT ( 4 );
50 const float DEFAULT_OPT_PAGE_COUNT ( 10 ); 50 const float DEFAULT_OPT_PAGE_COUNT ( 10 );
51 const bool DEFAULT_OPT_USE_TABLEVIEW ( true ); 51 const bool DEFAULT_OPT_USE_TABLEVIEW ( true );
52 -const bool DEFAULT_OPT_BATCHING_ENABLED ( true );  
53 const bool DEFAULT_OPT_ICON_LABELS ( true ); 52 const bool DEFAULT_OPT_ICON_LABELS ( true );
54 const IconType DEFAULT_OPT_ICON_TYPE ( IMAGEVIEW ); 53 const IconType DEFAULT_OPT_ICON_TYPE ( IMAGEVIEW );
55 const bool DEFAULT_OPT_USE_TEXT_LABEL ( false ); 54 const bool DEFAULT_OPT_USE_TEXT_LABEL ( false );
@@ -116,7 +115,6 @@ public: @@ -116,7 +115,6 @@ public:
116 mCols( DEFAULT_OPT_COL_COUNT ), 115 mCols( DEFAULT_OPT_COL_COUNT ),
117 mPageCount( DEFAULT_OPT_PAGE_COUNT ), 116 mPageCount( DEFAULT_OPT_PAGE_COUNT ),
118 mTableViewEnabled( DEFAULT_OPT_USE_TABLEVIEW ), 117 mTableViewEnabled( DEFAULT_OPT_USE_TABLEVIEW ),
119 - mBatchingEnabled( DEFAULT_OPT_BATCHING_ENABLED ),  
120 mIconLabelsEnabled( DEFAULT_OPT_ICON_LABELS ), 118 mIconLabelsEnabled( DEFAULT_OPT_ICON_LABELS ),
121 mIconType( DEFAULT_OPT_ICON_TYPE ), 119 mIconType( DEFAULT_OPT_ICON_TYPE ),
122 mUseTextLabel( DEFAULT_OPT_USE_TEXT_LABEL ) 120 mUseTextLabel( DEFAULT_OPT_USE_TEXT_LABEL )
@@ -127,7 +125,6 @@ public: @@ -127,7 +125,6 @@ public:
127 int mCols; 125 int mCols;
128 int mPageCount; 126 int mPageCount;
129 bool mTableViewEnabled; 127 bool mTableViewEnabled;
130 - bool mBatchingEnabled;  
131 bool mIconLabelsEnabled; 128 bool mIconLabelsEnabled;
132 IconType mIconType; 129 IconType mIconType;
133 bool mUseTextLabel; 130 bool mUseTextLabel;
@@ -235,9 +232,6 @@ public: @@ -235,9 +232,6 @@ public:
235 imagePath << IMAGE_PATH_PREFIX << currentIconIndex << IMAGE_PATH_POSTFIX; 232 imagePath << IMAGE_PATH_PREFIX << currentIconIndex << IMAGE_PATH_POSTFIX;
236 map[ Dali::Toolkit::ImageVisual::Property::URL ] = imagePath.str(); 233 map[ Dali::Toolkit::ImageVisual::Property::URL ] = imagePath.str();
237 234
238 - // Enable/disable batching  
239 - map[ Toolkit::ImageVisual::Property::BATCHING_ENABLED ] = mConfig.mBatchingEnabled;  
240 -  
241 imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map ); 235 imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
242 imageView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); 236 imageView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
243 imageView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); 237 imageView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
@@ -396,11 +390,6 @@ public: @@ -396,11 +390,6 @@ public:
396 page.SetAnchorPoint( AnchorPoint::CENTER ); 390 page.SetAnchorPoint( AnchorPoint::CENTER );
397 page.SetPosition( Vector3( stageSize.x * i, 0.0f, 0.0f ) ); 391 page.SetPosition( Vector3( stageSize.x * i, 0.0f, 0.0f ) );
398 mScrollParent.Add( page ); 392 mScrollParent.Add( page );
399 -  
400 - if( mConfig.mTableViewEnabled && mConfig.mBatchingEnabled )  
401 - {  
402 - page.SetProperty( DevelActor::Property::BATCH_PARENT, true );  
403 - }  
404 } 393 }
405 394
406 mScrollParent.SetOpacity( 1.0f ); 395 mScrollParent.SetOpacity( 1.0f );
@@ -476,8 +465,7 @@ void RunTest( Application&amp; application, const HomescreenBenchmark::Config&amp; confi @@ -476,8 +465,7 @@ void RunTest( Application&amp; application, const HomescreenBenchmark::Config&amp; confi
476 PrintHelp( "c<num>", " Number of columns" ); 465 PrintHelp( "c<num>", " Number of columns" );
477 PrintHelp( "r<num>", " Number of rows" ); 466 PrintHelp( "r<num>", " Number of rows" );
478 PrintHelp( "p<num>", " Number of pages ( must be greater than 1 )" ); 467 PrintHelp( "p<num>", " Number of pages ( must be greater than 1 )" );
479 - PrintHelp( "-disable-tableview", " Disables the use of TableView for layouting (must be enabled for batching)" );  
480 - PrintHelp( "-disable-batching", " Disables geometry batching" ); 468 + PrintHelp( "-disable-tableview", " Disables the use of TableView for layouting" );
481 PrintHelp( "-disable-icon-labels", " Disables labels for each icon" ); 469 PrintHelp( "-disable-icon-labels", " Disables labels for each icon" );
482 PrintHelp( "-use-checkbox", " Uses checkboxes for icons" ); 470 PrintHelp( "-use-checkbox", " Uses checkboxes for icons" );
483 PrintHelp( "-use-text-label", " Uses TextLabel instead of a TextVisual" ); 471 PrintHelp( "-use-text-label", " Uses TextLabel instead of a TextVisual" );
@@ -514,10 +502,6 @@ int DALI_EXPORT_API main( int argc, char **argv ) @@ -514,10 +502,6 @@ int DALI_EXPORT_API main( int argc, char **argv )
514 { 502 {
515 config.mTableViewEnabled = false; 503 config.mTableViewEnabled = false;
516 } 504 }
517 - else if( arg.compare( "--disable-batching" ) == 0 )  
518 - {  
519 - config.mBatchingEnabled = false;  
520 - }  
521 else if( arg.compare( "--disable-icon-labels" ) == 0 ) 505 else if( arg.compare( "--disable-icon-labels" ) == 0 )
522 { 506 {
523 config.mIconLabelsEnabled = false; 507 config.mIconLabelsEnabled = false;