# HG changeset patch # User Faisal Memon # Date 1283968574 -3600 # Node ID c9d1eb0bfac8834cba6f5565e5b29ac1a8bc0d28 # Parent 1b3a923fcf079c80613ee62f8c78bce1382ede5e Get rid of pitch code because the host side does not need it diff -r 1b3a923fcf07 -r c9d1eb0bfac8 guestrendering/guestegl/inc/guestegl.h --- a/guestrendering/guestegl/inc/guestegl.h Wed Sep 08 17:36:16 2010 +0100 +++ b/guestrendering/guestegl/inc/guestegl.h Wed Sep 08 18:56:14 2010 +0100 @@ -326,7 +326,6 @@ TSurfaceInfo* EglInternalFunction_GetPlatformSurface( EGLDisplay display, EGLSurface surface ); void EglInternalFunction_AbortWindowInit(TEglThreadState& aThreadState, EGLDisplay aDisplay, EGLSurface aSurface, TSurfaceInfo* ps, RWindow* window, CWsScreenDevice* screenDevice); TBool EglInternalFunction_SwapWindowSurface(TEglThreadState& aThreadState, EGLDisplay aDisplay, EGLSurface aSurface); - TInt EglInternalFunction_GetPitch( RWindow* aNativeWindow, TInt& aHorizontalPitch, TInt& aVerticalPitch ); TBool EglInternalFunction_MetaGetConfigs( TEglThreadState& aThreadState, EGLConfig*& aConfigs, EGLint& aConfigCnt, EGLint*& aConfigAttribs, EGLint& aConfigAttribsLen, TMetaGetConfigsMode aFetchMode = EMetaGetConfigsSg ); // more private functions diff -r 1b3a923fcf07 -r c9d1eb0bfac8 guestrendering/guestegl/src/eglsgimage.cpp --- a/guestrendering/guestegl/src/eglsgimage.cpp Wed Sep 08 17:36:16 2010 +0100 +++ b/guestrendering/guestegl/src/eglsgimage.cpp Wed Sep 08 18:56:14 2010 +0100 @@ -134,12 +134,12 @@ } #else void CEglImage::Duplicate() {} -TBool CEglImage::OpenForVgImage(TSize& aSize, VGHandle& aVgHandle, TUint64& aSgImageId) {} -TBool CEglImage::Close() {} -TBool CEglImage::Destroy() {} -TBool CEglImage::IsDestroyed() const {} -TInt CEglImage::RefCount() {} -EGLDisplay CEglImage::Display() const {} +TBool CEglImage::OpenForVgImage(TSize& aSize, VGHandle& aVgHandle, TUint64& aSgImageId) {return ETrue;} +TBool CEglImage::Close() {return ETrue;} +TBool CEglImage::Destroy() {return ETrue;} +TBool CEglImage::IsDestroyed() const {return ETrue;} +TInt CEglImage::RefCount() {return 0;} +EGLDisplay CEglImage::Display() const {return ETrue;} #endif diff -r 1b3a923fcf07 -r c9d1eb0bfac8 guestrendering/guestegl/src/guestegl.cpp --- a/guestrendering/guestegl/src/guestegl.cpp Wed Sep 08 17:36:16 2010 +0100 +++ b/guestrendering/guestegl/src/guestegl.cpp Wed Sep 08 18:56:14 2010 +0100 @@ -32,7 +32,6 @@ // // FAISALMEMON STUB CODE -#define PITCH_OF_TWIPS_PIXELS(a, b) 1 /* This is incorrect; just a stub*/ #define EGL_CHECK_ERROR(a, b, c) /* This does no checking; just a stub */ void CGuestEGL::EglInternalFunction_DestroyWindowSurface(TSurfaceInfo&) { @@ -766,36 +765,6 @@ return result; } -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// -TInt CGuestEGL::EglInternalFunction_GetPitch(RWindow* aNativeWindow, TInt& aHorizontalPitch, TInt& aVerticalPitch) - { - RWsSession* ws = aNativeWindow->Session(); - CWsScreenDevice* screenDevice = new CWsScreenDevice(*ws); - if ( !screenDevice ) - { - return KErrNoMemory; - } - TInt err = screenDevice->Construct(); - - if ( KErrNone == err ) - { - TSize pixelSize = screenDevice->SizeInPixels(); - TSize twipSize = screenDevice->SizeInTwips(); - - aHorizontalPitch = PITCH_OF_TWIPS_PIXELS(twipSize.iWidth , pixelSize.iWidth); - aVerticalPitch = PITCH_OF_TWIPS_PIXELS(twipSize.iHeight, pixelSize.iHeight); - } - delete screenDevice; - return err; - } - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -// EGLBoolean CGuestEGL::eglSwapBuffers(TEglThreadState& aThreadState, EGLDisplay aDisplay, EGLSurface aSurface) { EglInternalFunction_SwapWindowSurface(aThreadState, aDisplay, aSurface);