--- a/guestrendering/guestvideodriver/ldd/src/devicereqhandler.cpp	Thu Aug 26 13:24:02 2010 +0100
+++ b/guestrendering/guestvideodriver/ldd/src/devicereqhandler.cpp	Thu Aug 26 13:29:31 2010 +0100
@@ -720,8 +720,6 @@
 void DDeviceReqHandler::getVGSyncInOp( TAsyncRequest* aReq, TInt aSgHandleIndexInReq, TBool aSetBufferDirty )
     {    
     VVHW_TRACE( "DDeviceReqHandler::getVGSyncInOp" );
-    EGLSurface surface( EGL_NO_SURFACE );//The pbuffer surface to sync from, if needed
-    VGboolean syncNeeded = VG_FALSE;
     OpenVgRFC call( aReq->iRemoteFunctionCall );
     TUint64 sgId(NULL);
     
@@ -735,6 +733,8 @@
         }
     
 #ifdef FAISALMEMON_S4_SGIMAGE
+    EGLSurface surface( EGL_NO_SURFACE );//The pbuffer surface to sync from, if needed
+    VGboolean syncNeeded = VG_FALSE;
     if( sgId != NULL )
         {
         VVHW_TRACE( "DDeviceReqHandler::getVGSyncInOp SgImage-backing VGImage found" );
@@ -998,13 +998,13 @@
 TInt DDeviceReqHandler::DestroySgImage( const TUint64 aId )
     {
     VVHW_TRACE("DDeviceReqHandler::DestroySgImage ->");
+    
+#ifdef FAISALMEMON_S4_SGIMAGE
     TBool allok = ETrue;
     TAsyncRequest* req(0);
     TPckg<TUint32> res( iOpReturn );
     EGLSurface surface(0);
     VGImage    image(0);
-    
-#ifdef FAISALMEMON_S4_SGIMAGE
     DSgResource* resource;
     HBuf8* data = OpenSgImageMetaData( aId, resource );
     if( data )