Merge 3. Improve performance by switching to less aggressive settings for RI_NUM_TESSELLATED_SEGMENTS and RI_MAX_SAMPLES. Ignored the WIN32 specific API decoration defines when doing the merge. Note the code is now optimised in riPath.cpp to change from RI_NUM_TESSELLATED_SEGMENTS to _QUAD, _CUBIC, _ARC settings which are each now set to 8. SVG Tiger now renders in 5 seconds (15 seconds quicker). The quality of the OVG icons is slightly reduced but still very useable.
// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
// which accompanies this distribution, and is available
// at the URL "http://www.eclipse.org/legal/epl-v10.html".
//
// Initial Contributors:
// Nokia Corporation - initial contribution.
//
// Contributors:
//
// Description:
//
/**
@file
@test
@internalComponent - Internal Symbian test code
*/
#include "tsmallwindowstestopenvg.h"
#include "tsmallwindowopenvg.h"
#include <imageconversion.h>
const TInt KNumberOfBounces = 3;
_LIT(KDummy, "dummy");
_LIT(KTestStep0014,"GRAPHICS-UI-BENCH-S60-0014");
const TInt KWindowsAcross = 2;
const TInt KWindowsDown = 2;
CTSmallWindowsTestOpenVG::CTSmallWindowsTestOpenVG()
{
SetTestStepName(KTSmallWindowsOpenVG);
}
CTSmallWindowsTestOpenVG::~CTSmallWindowsTestOpenVG()
{
delete iFlowWindowsController;
iFileNames.Close();
}
TVerdict CTSmallWindowsTestOpenVG::doTestStepPreambleL()
{
CTe_graphicsperformanceSuiteStepBase::doTestStepPreambleL();
TSize screenSize = CTWindow::GetDisplaySizeInPixels();
// set window size to create required grid
iWindowSize.iHeight = screenSize.iHeight / KWindowsDown;
iWindowSize.iWidth = screenSize.iWidth / KWindowsAcross;
// adjust window size to maintain image aspect ratio
if (iWindowSize.iWidth > iWindowSize.iHeight)
{
iWindowSize.iWidth = iWindowSize.iHeight;
}
else
{
iWindowSize.iHeight = iWindowSize.iWidth;
}
TPoint initialPosition(0, 0);
RArray<TPoint> initialPositions;
RArray<pTWindowCreatorFunction> windowCreatorFunctions;
CleanupClosePushL(initialPositions);
CleanupClosePushL(windowCreatorFunctions);
for (TInt i = 0; i < KWindowsAcross; i++)
{
initialPosition.iY = 0;
for (TInt j = 0; j < KWindowsDown; j++)
{
windowCreatorFunctions.AppendL(CTSmallWindowOpenVG::NewL);
initialPositions.AppendL(initialPosition);
iFileNames.AppendL(KDummy());
initialPosition.iY += iWindowSize.iHeight;
}
initialPosition.iX += iWindowSize.iWidth;
}
iFlowWindowsController = CTFlowWindowsController::NewL(ETrue, iFileNames, iWindowSize, windowCreatorFunctions, initialPositions, ETrue);
CleanupStack::PopAndDestroy(2, &initialPositions);
// run the test enough frames to see move the grid across the screen
if (screenSize.iHeight > screenSize.iWidth)
{
iIterationsToTest = KNumberOfBounces * (screenSize.iHeight - iWindowSize.iHeight * KWindowsDown);
}
else
{
iIterationsToTest = KNumberOfBounces * (screenSize.iWidth - iWindowSize.iWidth * KWindowsAcross);
}
return TestStepResult();
}
/**
Override of base class pure virtual
Our implementation only gets called if the base class doTestStepPreambleL() did
not leave.
@return - TVerdict code
*/
TVerdict CTSmallWindowsTestOpenVG::doTestStepL()
{
SetTestStepID(KTestStep0014);
FlowWindowsL();
//RecordTestResultL(); // todo: not possible because of heap alloc panic
return TestStepResult();
}
/**
@SYMTestCaseID
GRAPHICS-UI-BENCH-S60-0014
@SYMTestCaseDesc
Tests how long it takes to move small OpenVG windows over the screen.
@SYMTestActions
Creates windows which draw OpenVG content and moves them over the screen.
@SYMTestExpectedResults
Test should pass and write the average framerate of the test to a log file.
*/
void CTSmallWindowsTestOpenVG::FlowWindowsL()
{
iProfiler->InitResults();
iIterationsToTest = 10;
for (TInt i = 0; i <= iIterationsToTest; ++i)
{
iFlowWindowsController->MoveL();
}
iProfiler->MarkResultSetL();
TInt drawingRect = iWindowSize.iHeight * iWindowSize.iWidth * KWindowsAcross * KWindowsDown;
iProfiler->ResultsAnalysisFrameRate(KTestStep0014, 0, 0, 0, iIterationsToTest, drawingRect);
}