# HG changeset patch
# User Matt Plumtree <matt.plumtree@nokia.com>
# Date 1285247358 -3600
# Node ID e77cac87b3972e81db7917f038aaad8dd1b6ff4d
# Parent  f204b762818d61f332ae0f839926c90e9fe6c412# Parent  9464ab1666a09d3ba047a212f29ba4389bda8b6e
Merge rename of frame buffer to surface buffer with Guest EGL changes.

diff -r f204b762818d -r e77cac87b397 .hgignore
diff -r f204b762818d -r e77cac87b397 guestrendering/guestegl/src/guestegl.cpp
--- a/guestrendering/guestegl/src/guestegl.cpp	Thu Sep 23 13:56:33 2010 +0100
+++ b/guestrendering/guestegl/src/guestegl.cpp	Thu Sep 23 14:09:18 2010 +0100
@@ -122,7 +122,6 @@
         return NULL;
         }
     else if (strncmp("EGLImageTargetTexture2DOES", aName, strlen("EGLImageTargetTexture2DOES")) == 0)
-None
         {
         return NULL;
         }
@@ -1085,12 +1084,16 @@
     // FAISALMEMON write code to handle errors in the above function
     EGL_TRACE("CGuestEGL::EglInternalFunction_CreateSurface AFTER VGHWUtils::MapToHWAddress");
 
+	TUint32 surfaceBufferBaseAddress(0);
+	(void)CVghwUtils::GetSurfaceBufferBaseAddress(frameBufferBaseAddress);
+	EGL_TRACE("CGuestEGL::egliCreateSurface AFTER VGHWUtils::MapToHWAddress");
+
     /* Store the pointer to the pixel data */
     aSurfaceInfo.iBuffer0 = aSurfaceInfo.iChunk->Base() + offsetToFirstBuffer;
     aSurfaceInfo.iBuffer1 = aSurfaceInfo.iChunk->Base() + offsetToSecondBuffer;
 
-    aSurfaceInfo.iBuffer0Index = (chunkHWBase + offsetToFirstBuffer) - VVI_SURFACEBUFFER_BASE_ADDRESS;
-    aSurfaceInfo.iBuffer1Index = (chunkHWBase + offsetToSecondBuffer) - VVI_SURFACEBUFFER_BASE_ADDRESS;
+    aSurfaceInfo.iBuffer0Index = (chunkHWBase + offsetToFirstBuffer) -  surfaceBufferBaseAddress;
+    aSurfaceInfo.iBuffer1Index = (chunkHWBase + offsetToSecondBuffer) - surfaceBufferBaseAddress;
     EGL_TRACE("CGuestEGL::EglInternalFunction_CreateSurface %u %x %x %x %x",chunkHWBase, offsetToFirstBuffer, offsetToSecondBuffer,
     		aSurfaceInfo.iBuffer0Index,
     		aSurfaceInfo.iBuffer1Index);
diff -r f204b762818d -r e77cac87b397 guestrendering/guestvideodriver/rom/guestvideodriver.iby
--- a/guestrendering/guestvideodriver/rom/guestvideodriver.iby	Thu Sep 23 13:56:33 2010 +0100
+++ b/guestrendering/guestvideodriver/rom/guestvideodriver.iby	Thu Sep 23 14:09:18 2010 +0100
@@ -19,7 +19,9 @@
 
 file=ABI_DIR\BUILD_DIR\guestvideohwapi.dll                SHARED_LIB_DIR\guestvideohwapi.dll
 
+#ifdef FAISALMEMON_S4_SGIMAGE
 extension[VARID]=KERNEL_DIR\BUILD_DIR\reqhandlerextension.dll   \sys\bin\reqhandlerextension.dll
+#endif
 device[VARID]=KERNEL_DIR\BUILD_DIR\guestvideohw.ldd         \sys\bin\guestvideohw.ldd
 
 #endif // GUESTVIDEODRIVER_IBY
diff -r f204b762818d -r e77cac87b397 guestrendering/vghwutils/group/bld.inf
--- a/guestrendering/vghwutils/group/bld.inf	Thu Sep 23 13:56:33 2010 +0100
+++ b/guestrendering/vghwutils/group/bld.inf	Thu Sep 23 14:09:18 2010 +0100
@@ -17,6 +17,7 @@
 DEFAULT -WINSCW
 
 PRJ_EXPORTS
+../rom/vghwutils.iby           /epoc32/rom/include/vghwutils.iby
 
 PRJ_MMPFILES
 vghwutils.mmp
diff -r f204b762818d -r e77cac87b397 guestrendering/vghwutils/rom/vghwutils.iby
--- a/guestrendering/vghwutils/rom/vghwutils.iby	Thu Sep 23 13:56:33 2010 +0100
+++ b/guestrendering/vghwutils/rom/vghwutils.iby	Thu Sep 23 14:09:18 2010 +0100
@@ -17,7 +17,8 @@
 #define PLATSIMVGHWUTILS_IBY
 
 
-file=ABI_DIR\BUILD_DIR\vghwutils.dll                SHARED_LIB_DIR\vghwutils.dll
+file=ABI_DIR\BUILD_DIR\vghwutils.dll           \sys\bin\vghwutils.dll
+
 
 #endif // PLATSIMVGHWUTILS_IBY