Merge 1. Pull in cpp files in the performance enhanced Khronos RI OVG files which are newly added. I've ignored platform-specific cpp files for linux, macosx, and null operating systems because this local solution has its own platform glue (i.e. facility to target Bitmaps but no full windowing support). I've ignored sfEGLInterface.cpp because this is used as a bridge to go from EGL to Nokia's Platsim which offers an EGL service. That's not relevant to this implementation because this is ARM side code, not Intel side. I just left a comment to sfEGLInterface.cpp in case we need to pick up this later on. The current code compiles on winscw. Prior to this fix, the code works on winscw, and can launch the SVG tiger (tiger.exe). That takes about 20 seconds to render. I hope to always be able to show this icon on each commit, and the plan is for the render time to reduce with this series of submissions. On this commit, the tiger renders ok in 20 seconds.
// Copyright (c) 1997-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:
//
#include <hal.h>
#include "scdraw.h"
/**
Constructs the CDrawScreenBitmap object.
@param aScreenNo Screen number. It will be used in HAL::Get() calls.
@param aBitmapAddress The screen memory address.
@param aSize Screen size
@return System-wide error codes, KErrNone if the construction was successfull.
*/
TInt CDrawScreenBitmap::ConstructScreen(TInt aScreenNo, TAny* aBitmapAddress,TSize aSize)
{
iScreenNo = aScreenNo;
TInt ret = SCREEN_LAYOUT_BASE_BITMAP::Construct(aSize);
if (ret != KErrNone)
return ret;
//fixup for emulating smaller screen
TInt offset = 0;
ret = HAL::Get(iScreenNo, HALData::EDisplayOffsetBetweenLines, offset);
if (ret == KErrNone && (offset != aSize.iWidth))
{
iLongWidth = offset;
iScanLineWords = iLongWidth / 4;
User::Heap().Free(iScanLineBuffer);
iScanLineBuffer = (TUint32*)(User::Heap().Alloc(offset));
if(iScanLineBuffer == NULL)
return KErrNoMemory;
}
//fixup for emulating smaller screen
offset = 0; // Pass in display mode
ret = HAL::Get(iScreenNo, HALData::EDisplayOffsetToFirstPixel,offset);
iBits = (TUint32*)aBitmapAddress;
iBits += offset / sizeof(TUint32);
return ret;
}
void CDrawScreenBitmap::SetDisplayMode(CFbsDrawDevice* aDrawDevice)
{
CopyOldSettings(aDrawDevice);
}
void CDrawScreenBitmap::OrientationsAvailable(TBool aOrientation[4])
{
aOrientation[EOrientationNormal] = ETrue;
aOrientation[EOrientationRotated90] = ETrue;
aOrientation[EOrientationRotated180] = ETrue;
aOrientation[EOrientationRotated270] = ETrue;
}
TBool CDrawScreenBitmap::SetOrientation(TOrientation aOrientation)
{
iOrientation = aOrientation;
return ETrue;
}
TInt CDrawScreenBitmap::HorzTwipsPerThousandPixels() const
{
if (iSize.iWidth == 0)
return 0;
TInt twips = 0;
HAL::Get(iScreenNo, HALData::EDisplayXTwips,twips);
return twips * 1000 / iSize.iWidth; // iSize gets iWidth and iHeight swapped by changing the orientation so always use iWidth
}
TInt CDrawScreenBitmap::VertTwipsPerThousandPixels() const
{
if (iSize.iHeight == 0)
return 0;
TInt twips = 0;
HAL::Get(iScreenNo, HALData::EDisplayYTwips,twips);
return twips * 1000 / iSize.iHeight;
}