# HG changeset patch # User Matt Plumtree # Date 1289230806 0 # Node ID 4ba73111e824b6724c101b4982b5ea7160d80a5b # Parent 11fc086941ac6c0fabbcafd0055c1788c184486b Provide alternative constructor for Nokia internal use (PlatSim compatibility). diff -r 11fc086941ac -r 4ba73111e824 vghwinterface/vghwapiwrapper/inc/KhronosAPIWrapper.h --- a/vghwinterface/vghwapiwrapper/inc/KhronosAPIWrapper.h Mon Nov 08 15:39:31 2010 +0000 +++ b/vghwinterface/vghwapiwrapper/inc/KhronosAPIWrapper.h Mon Nov 08 15:40:06 2010 +0000 @@ -47,6 +47,7 @@ #endif class MGraphicsVHWCallback; +class protocol_MGraphicsVHWCallback; class KHRONOSAPIWRAPPER_API KhronosAPIWrapper: private MRequestBufferBookKeepingReader { @@ -54,6 +55,8 @@ KhronosAPIWrapper( MGraphicsVHWCallback* aServiceIf, void* surfacebuffer, void* inputdata, void* outputdata ); + KhronosAPIWrapper( protocol_MGraphicsVHWCallback* aServiceIf, void* surfacebuffer, + void* inputdata, void* outputdata ); virtual ~KhronosAPIWrapper(); void WorkerThread(); @@ -78,6 +81,8 @@ EGLAPIWrapper* GetEGLWrapper() { return m_EGLWrapper; } private: + void Construct( MGraphicsVHWCallback* aServiceIf, void* surfacebuffer, + void* inputdata, void* outputdata ); //From MRequestBufferBookKeeping TUint32 GetWriteCount(); void IncrementReadCount( TUint32 aReadCount ); diff -r 11fc086941ac -r 4ba73111e824 vghwinterface/vghwapiwrapper/src/KhronosAPIWrapper.cpp --- a/vghwinterface/vghwapiwrapper/src/KhronosAPIWrapper.cpp Mon Nov 08 15:39:31 2010 +0000 +++ b/vghwinterface/vghwapiwrapper/src/KhronosAPIWrapper.cpp Mon Nov 08 15:40:06 2010 +0000 @@ -303,9 +303,9 @@ } -KhronosAPIWrapper::KhronosAPIWrapper( MGraphicsVHWCallback* aServiceIf, void* surfacebuffer, void* inputdata, void* outputdata ) +void KhronosAPIWrapper::Construct( MGraphicsVHWCallback* aServiceIf, void* surfacebuffer, void* inputdata, void* outputdata ) { - TRACE("KhronosAPIWrapper::KhronosAPIWrapper()\n"); + TRACE("KhronosAPIWrapper::Construct()\n"); m_lastVgError = VG_NO_ERROR; m_lastEglError = EGL_SUCCESS; @@ -346,6 +346,16 @@ #endif } +KhronosAPIWrapper::KhronosAPIWrapper( MGraphicsVHWCallback* aServiceIf, void* surfacebuffer, void* inputdata, void* outputdata ) +{ + Construct( aServiceIf, surfacebuffer, inputdata, outputdata ); +} + +KhronosAPIWrapper::KhronosAPIWrapper( protocol_MGraphicsVHWCallback* aServiceIf, void* surfacebuffer, void* inputdata, void* outputdata ) +{ + Construct( (MGraphicsVHWCallback*)aServiceIf, surfacebuffer, inputdata, outputdata ); +} + KhronosAPIWrapper::~KhronosAPIWrapper() { TRACE("KhronosAPIWrapper::~KhronosAPIWrapper\n");