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) 2007-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:
// General inline utility and logging functions for use with DirectGDI.
//
//
/**
@file
@publishedPartner
@prototype
*/
#ifndef DIRECTGDIPANICS_INL
#define DIRECTGDIPANICS_INL
#include <e32std.h>
#include <e32debug.h>
_LIT(KDGDILogFormat, "File %S +%i: %S");
_LIT(KDGDINonConditionalPanicFormat, "Panic: %S %i.");
_LIT(KDGDIConditionalPanicFormat, "Panic: %S %i, assert \"%S\" failed.");
namespace DirectGdi
{
/**
Helper function used by the GRAPHICS_LOG_ALWAYS and GRAPHICS_LOGD_ALWAYS macros.
*/
inline void Log(const TDesC& aFileName, TInt aLine, const TDesC& aLogMessage)
{
TBuf<256> buf;
buf.Format(KDGDILogFormat, &aFileName, aLine, &aLogMessage);
RDebug::Print(buf);
}
/**
Helper function used by GRAPHICS_ASSERT_ALWAYS and GRAPHICS_PANIC_ALWAYS macros
which allows a panic category and code to be logged.
*/
inline void PanicWithDebugLog (
const TDesC& aPanicCategory,
TInt aPanicCode,
const TDesC& aFileName,
TInt aLine,
const TDesC* aCondition)
{
TBuf<256> message;
if (aCondition)
{
message.Format(KDGDIConditionalPanicFormat, &aPanicCategory, aPanicCode, aCondition);
}
else
{
message.Format(KDGDINonConditionalPanicFormat, &aPanicCategory, aPanicCode);
}
Log(aFileName, aLine, message);
User::Panic(aPanicCategory, aPanicCode);
}
}
#endif // DIRECTGDIPANICS_INL