guestrendering/vghwutils/src/vghwutils.cpp
branchbug235_bringup_0
changeset 9 0af9dd6c2c3a
parent 7 ec0e558822c5
child 30 f204b762818d
--- a/guestrendering/vghwutils/src/vghwutils.cpp	Thu Sep 02 11:20:15 2010 +0100
+++ b/guestrendering/vghwutils/src/vghwutils.cpp	Thu Sep 02 16:06:36 2010 +0100
@@ -172,7 +172,7 @@
 							}
 							break;
 						case 2:
-							creationError = User::LoadLogicalDevice(_L("platsimvideohw"));
+							creationError = User::LoadLogicalDevice(_L("guestvideohw"));
 							if ( (KErrNone == creationError) || (KErrAlreadyExists == creationError) )
 								{
 								creationError = iDriver->Open();
@@ -803,10 +803,16 @@
 // Use driver to discover base address of the frame memory.
 // -----------------------------------------------------------------------------
 //	  
-EXPORT_C TInt TVghwUtils::GetFrameBufferBaseAddress( TUint32& aHWAddress )
+EXPORT_C TInt CVghwUtils::GetFrameBufferBaseAddress( TUint32& aHWAddress )
 	{
 	UTIL_TRACE("TVghwUtils::GetFrameBufferBaseAddress");
-	return VghwSingleton.Driver().GetFrameBufferBaseAddress( aHWAddress );
+	if (!iInitialized || !iDriver)
+		{
+		UTIL_TRACE("CVghwUtils::GetFrameBufferBaseAddress called before initialised VghwUtils: iInitialized=%d, iDriver=0x%x", iInitialized, iDriver);
+		InitStatics();
+		}
+	VGHWPANIC_ASSERT(iInitialized && iDriver, EVghwPanicGraphicsDriverNotOpen);
+	return iDriver->GetFrameBufferBaseAddress( aHWAddress );
 	}
 
 #ifdef _DEBUG