Fixup missed changes from frame (buffer) to surface buffer.
Change route to qemu syborg.h and memory model includes.
--- a/guestrendering/guestegl/src/guestegl.cpp Thu Sep 23 14:09:18 2010 +0100
+++ b/guestrendering/guestegl/src/guestegl.cpp Thu Sep 23 15:54:53 2010 +0100
@@ -1085,7 +1085,7 @@
EGL_TRACE("CGuestEGL::EglInternalFunction_CreateSurface AFTER VGHWUtils::MapToHWAddress");
TUint32 surfaceBufferBaseAddress(0);
- (void)CVghwUtils::GetSurfaceBufferBaseAddress(frameBufferBaseAddress);
+ (void)CVghwUtils::GetSurfaceBufferBaseAddress(surfaceBufferBaseAddress);
EGL_TRACE("CGuestEGL::egliCreateSurface AFTER VGHWUtils::MapToHWAddress");
/* Store the pointer to the pixel data */
--- a/guestrendering/guestvideodriver/api/src/guestvideodriver.cpp Thu Sep 23 14:09:18 2010 +0100
+++ b/guestrendering/guestvideodriver/api/src/guestvideodriver.cpp Thu Sep 23 15:54:53 2010 +0100
@@ -229,7 +229,7 @@
EXPORT_C TInt RGuestVideoDriver::GetSurfaceBufferBaseAddress( TUint32& aSurfaceBufferBaseAddress )
{
TPckg<TUint32> address( aSurfaceBufferBaseAddress );
- return DoControl( GuestVideoDriver::ERequestSurfaceBaseAddress, (TAny*)&address );
+ return DoControl( GuestVideoDriver::ERequestSurfaceBufferBaseAddress, (TAny*)&address );
}
// -----------------------------------------------------------------------------
--- a/guestrendering/guestvideodriver/ldd/group/virtualvideohwdevice.mmp Thu Sep 23 14:09:18 2010 +0100
+++ b/guestrendering/guestvideodriver/ldd/group/virtualvideohwdevice.mmp Thu Sep 23 15:54:53 2010 +0100
@@ -33,15 +33,8 @@
USERINCLUDE ../inc
USERINCLUDE ../../commoninc
-
-// This is a co-dependency between adaptation layer packages. This needs
-// to be refactored in qemu to be a OS level export
-USERINCLUDE ../../../../../qemu/baseport/syborg/specific
-
-// There is a weird depedency here to satisfy syborg to get to the flexible
-// memory model for its syborg.h header
-SYSTEMINCLUDE /epoc32/include/platform/memmodel/epoc/multiple/arm
-SYSTEMINCLUDE /epoc32/include/platform/memmodel/epoc/moving
+#include <../../../../../../adaptation/qemu/baseport/syborg/variant.mmh>
+USERINCLUDE ../../../../../../adaptation/qemu/baseport/syborg/specific
SYSTEMINCLUDE /epoc32/include/drivers
--- a/guestrendering/guestvideodriver/ldd/src/virtualvideohwinterface.cpp Thu Sep 23 14:09:18 2010 +0100
+++ b/guestrendering/guestvideodriver/ldd/src/virtualvideohwinterface.cpp Thu Sep 23 15:54:53 2010 +0100
@@ -315,7 +315,7 @@
}
}
-EXPORT_C TPhysAddr DVirtualVideoHwInterface::GetSurfaceBase()
+EXPORT_C TPhysAddr DVirtualVideoHwInterface::GetSurfaceBufferBase()
{
TPhysAddr ret = 0;
if( iVideoRamBasePhys != 0 )
--- a/guestrendering/vghwutils/eabi/vghwutilsu.def Thu Sep 23 14:09:18 2010 +0100
+++ b/guestrendering/vghwutils/eabi/vghwutilsu.def Thu Sep 23 15:54:53 2010 +0100
@@ -29,7 +29,7 @@
_ZN10CVghwUtils11VgApiForEglEv @ 28 NONAME
_ZN10CVghwUtils15Gles11ApiForEglEv @ 29 NONAME
_ZN10CVghwUtils14Gles2ApiForEglEv @ 30 NONAME
- _ZN10CVghwUtils25GetSurfaceBufferBaseAddressERm @ 31 NONAME
+ _ZN10CVghwUtils27GetSurfaceBufferBaseAddressERm @ 31 NONAME