# HG changeset patch # User Jose Thachil # Date 1273665933 -3600 # Node ID 0fb7b31791c3abe780e4f35e1bd62025365f028b # Parent 5b9c23c1a54c8fca2f19e2ac5e80f74b06843da8 Minor updates. diff -r 5b9c23c1a54c -r 0fb7b31791c3 egl/eglrefimpl/src/session.cpp --- a/egl/eglrefimpl/src/session.cpp Wed May 12 12:14:19 2010 +0100 +++ b/egl/eglrefimpl/src/session.cpp Wed May 12 13:05:33 2010 +0100 @@ -72,7 +72,8 @@ CEglThreadSession::CEglThreadSession(CEglDriver& aDriver): iDriver(aDriver), - iError(EGL_SUCCESS) + iError(EGL_SUCCESS), + iEgl(NULL) { Dll::SetTls( NULL ); } @@ -202,7 +203,8 @@ } catch(std::bad_alloc) { - RI_DELETE(pEgl); + RI_DELETE(iEgl); + iEgl = NULL; RI_DELETE(newDisplay); SetError(EGL_BAD_DISPLAY); return EGL_FALSE; diff -r 5b9c23c1a54c -r 0fb7b31791c3 egl/sfopenvg/riApi.cpp --- a/egl/sfopenvg/riApi.cpp Wed May 12 12:14:19 2010 +0100 +++ b/egl/sfopenvg/riApi.cpp Wed May 12 13:05:33 2010 +0100 @@ -2554,11 +2554,7 @@ { //set up rendering surface and mask buffer Drawable* drawable = context->getCurrentDrawable(); - RDebug::Printf(" ***************** In drawPath,Drawable addr is %x $$$$$$$$$$$$$ ",drawable); - RDebug::Printf(" $$$$$$$$$$$$$ In drawPath,VGContext addr is %x $$$$$$$$$$$$$ ",context); - RDebug::Printf(" $$$$$$$$$$$$$ In drawPath,Widthis %d $$$$$$$$$$$$$ ",drawable->getWidth()); - RDebug::Printf(" $$$$$$$$$$$$$ In drawPath,Height is %d $$$$$$$$$$$$$ ",drawable->getHeight()); - + if(!drawable) return false; //no EGL surface is current at the moment @@ -2603,9 +2599,7 @@ { surfaceToPaintMatrix[2].set(0,0,1); //force affinity pixelPipe.setSurfaceToPaintMatrix(surfaceToPaintMatrix); - RDebug::Printf(" $$$$$$$$$$$$$ In drawPath,Widthis %d $$$$$$$$$$$$$ ",drawable->getWidth()); - RDebug::Printf(" $$$$$$$$$$$$$ In drawPath,Height is %d $$$$$$$$$$$$$ ",drawable->getHeight()); - renderStroke(context, drawable->getWidth(), drawable->getHeight(), numSamples, (Path*)path, rasterizer, &pixelPipe, userToSurface); + renderStroke(context, drawable->getWidth(), drawable->getHeight(), numSamples, (Path*)path, rasterizer, &pixelPipe, userToSurface); } } return true; diff -r 5b9c23c1a54c -r 0fb7b31791c3 egl/sfopenvg/symbian/riEGLOS.cpp --- a/egl/sfopenvg/symbian/riEGLOS.cpp Wed May 12 12:14:19 2010 +0100 +++ b/egl/sfopenvg/symbian/riEGLOS.cpp Wed May 12 13:05:33 2010 +0100 @@ -86,9 +86,9 @@ struct OSWindowContext { - //RDrawableWindow* iDrawWindow; //added by Jose. + //RDrawableWindow* iDrawWindow; TNativeWindowType iNativeWindowType; - //TNativeWindowType* iNativeWindowType; + }; void* OSCreateWindowContext(EGLNativeWindowType window) @@ -102,11 +102,11 @@ { return NULL; } - //ctx->iNativeWindowType = (TNativeWindowType*)window; //added by Jose + //ctx->iNativeWindowType = (TNativeWindowType*)window; - RDrawableWindow* drawbleWindow = (RDrawableWindow*)window; //added by Jose - ctx->iNativeWindowType.iSize.iHeight = drawbleWindow->Size().iHeight;//added by Jose - ctx->iNativeWindowType.iSize.iWidth = drawbleWindow->Size().iWidth; //added by Jose + RDrawableWindow* drawbleWindow = (RDrawableWindow*)window; + ctx->iNativeWindowType.iSize.iHeight = drawbleWindow->Size().iHeight; + ctx->iNativeWindowType.iSize.iWidth = drawbleWindow->Size().iWidth; return ctx; } @@ -139,12 +139,7 @@ { width=ctx->iNativeWindowType.iSize.iWidth; height=ctx->iNativeWindowType.iSize.iHeight; - - RDebug::Printf(" $$$$$$$$$$$$$ In OSGetWindowSize,Thread Id %Lu $$$$$$$$$$$$$ ",(RThread().Id())); - RDebug::Printf(" $$$$$$$$$$$$$ In OSGetWindowSize,Width is %d $$$$$$$$$$$$$ ",width); - RDebug::Printf(" $$$$$$$$$$$$$ In OSGetWindowSize,Height is %d $$$$$$$$$$$$$ ",height); - - } + } else { width = 0; @@ -162,17 +157,14 @@ void OSBlitToWindow(void* context, const Drawable* drawable) { - - OSWindowContext* ctx = (OSWindowContext*)context; + TUint w = drawable->getWidth(); + TUint h = drawable->getHeight(); + + OSWindowContext* ctx = (OSWindowContext*)context; //blit if either of iBitmap or iMaskBitmap exist if(ctx && ctx->iNativeWindowType.iBitmap) { - TUint w = drawable->getWidth(); - TUint h = drawable->getHeight(); - - RDebug::Printf("!!!!!!!!!!!!!!!!!!!!!!!!!! In OSBlitToWindow(),w is = %d\n", w); - RDebug::Printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!In OSBlitToWindow,h is = %d\n", h); - + //these should be same as bitmap if(ctx->iNativeWindowType.iBitmap) { @@ -238,10 +230,7 @@ *width = size.iWidth; *height = size.iHeight; *stride = ((CFbsBitmap*)pixmap)->DataStride(); - - RDebug::Printf(" ---------------------------- In OSGetNativePixmapInfo width is %d ^^^^^^^^^^^^^^^^^ ",size.iWidth); - RDebug::Printf(" ---------------------------- In OSGetNativePixmapInfo,height addr is %d ^^^^^^^^^^^^^^^^",size.iHeight); - + *data = (int*)(((CFbsBitmap*)pixmap)->DataAddress()); TDisplayMode mode = ((CFbsBitmap*)pixmap)->DisplayMode(); switch(mode) diff -r 5b9c23c1a54c -r 0fb7b31791c3 openvg/openvgrefimplementation/sfopenvg/test/group/tiger.mmp --- a/openvg/openvgrefimplementation/sfopenvg/test/group/tiger.mmp Wed May 12 12:14:19 2010 +0100 +++ b/openvg/openvgrefimplementation/sfopenvg/test/group/tiger.mmp Wed May 12 13:05:33 2010 +0100 @@ -45,10 +45,10 @@ library gdi.lib LIBRARY ws32.lib LIBRARY fntstr.lib -//LIBRARY sflibopenvgrefimpl.lib -//LIBRARY libegl_sw.lib -library libEGL.lib -LIBRARY libopenvg_sw.lib +//LIBRARY sflibopenvgrefimpl.lib +//LIBRARY libegl_sw.lib +library libEGL.lib +LIBRARY libopenvg_sw.lib START RESOURCE ..\data\tiger_reg.rss #ifdef WINSCW diff -r 5b9c23c1a54c -r 0fb7b31791c3 openvg/openvgrefimplementation/sfopenvg/vgi/vgi.cpp --- a/openvg/openvgrefimplementation/sfopenvg/vgi/vgi.cpp Wed May 12 12:14:19 2010 +0100 +++ b/openvg/openvgrefimplementation/sfopenvg/vgi/vgi.cpp Wed May 12 13:05:33 2010 +0100 @@ -140,10 +140,7 @@ //TSize maxSize(MAX_WIDTH,MAX_HEIGHT); TSize maxSize(aSize.iWidth, aSize.iHeight); - - RDebug::Printf(" ££££££££££££££££££ In VGISymbianInitialize,aSize.iWidth is %d $$$$$$$$$$$$$ ",aSize.iWidth); - RDebug::Printf(" £££££££££££££££££££ In VGISymbianInitialize,aSize.iHeight is %d $$$$$$$$$$$$$ ",aSize.iHeight); - + egl.iPixmap = new(ELeave) CFbsBitmap(); egl.iPixmap->Create( maxSize, EColor16MA );