Pull out dependencies on SGIMAGE using #ifdef FAISALMEMON_S4_SGIMAGE This is a temporary measure until we see the big picture and work out the best way to model it.
--- a/graphics_plat/guestvideodriver_api/ldd/inc/devicereqhandler.h Fri Aug 20 18:00:12 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/ldd/inc/devicereqhandler.h Wed Aug 25 17:53:16 2010 +0100
@@ -21,8 +21,12 @@
#include <kernel/kern_priv.h>
#include <e32cmn.h>
+#include <VG/openvg.h>
+
+#ifdef FAISALMEMON_S4_SGIMAGE
#include <sgresource/sgcommon.h>//TSgImageMetaData
#include "sgextension.h"//For SgExtension
+#endif
#include "guestvideodriverprotocol.h"
#include "virtualvideohwinterface.h"
@@ -499,9 +503,11 @@
void getVGSyncInOp( TAsyncRequest* aReq, TInt aSgHandleIndexInReq, TBool aSetBufferDirty = EFalse );
public:
+#ifdef FAISALMEMON_S4_SGIMAGE
HBuf8* OpenSgImageMetaData( const TUint64 aId, DSgResource*& aResource );
void CreateSgImagePbuffer( const TSgImageMetaData& aInfo, TRequestStatus* aStatus, DThread* aThread );
void CreateSgImageVGImage( const TSgImageMetaData& aInfo, TRequestStatus* aStatus, DThread* aThread );
+#endif
TInt DestroySgImage( const TUint64 aId );
void ContinueInit( TAsyncRequest* aReq );
--- a/graphics_plat/guestvideodriver_api/ldd/inc/reqhandlerextension.h Fri Aug 20 18:00:12 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/ldd/inc/reqhandlerextension.h Wed Aug 25 17:53:16 2010 +0100
@@ -21,15 +21,19 @@
#include <kernel/kernel.h>
+#ifdef FAISALMEMON_S4_SGIMAGE
#include <sgresource/sgcommon.h>//TSgImageMetaData
+#endif
#include "virtualvideotracing.h"
class MReqHandlerCallback
{
public:
+#ifdef FAISALMEMON_S4_SGIMAGE
virtual void CreateSgImagePbuffer( const TSgImageMetaData& aInfo, TRequestStatus* aStatus, DThread* aThread ) = 0;
virtual void CreateSgImageVGImage( const TSgImageMetaData& aInfo, TRequestStatus* aStatus, DThread* aThread ) = 0;
+#endif
virtual TInt DestroySgImage( const TUint64 aId ) = 0;
};
@@ -37,8 +41,10 @@
{
public:
TInt Construct();
+#ifdef FAISALMEMON_S4_SGIMAGE
void CreateSgImagePbuffer( const TSgImageMetaData& aInfo, TRequestStatus* aStatus, DThread* aThread );
void CreateSgImageVGImage( const TSgImageMetaData& aInfo, TRequestStatus* aStatus, DThread* aThread );
+#endif
TInt DestroySgImage( const TUint64 aId );
TInt SetReqHandler( MReqHandlerCallback* aHandler );
private:
@@ -50,8 +56,10 @@
{
public:
//SgImage Creation and Destruction commands:
- IMPORT_C static TInt CreateSgImagePbuffer( const TSgImageMetaData& aInfo );
+#ifdef FAISALMEMON_S4_SGIMAGE IMPORT_C
+ static TInt CreateSgImagePbuffer( const TSgImageMetaData& aInfo );
IMPORT_C static TInt CreateSgImageVGImage( const TSgImageMetaData& aInfo );
+#endif
IMPORT_C static TInt DestroySgImage( const TUint64 aId );
IMPORT_C static TInt SetReqHandler( MReqHandlerCallback* aHandler );
//other functions to be added
--- a/graphics_plat/guestvideodriver_api/ldd/inc/virtualvideohwchannel.h Fri Aug 20 18:00:12 2010 +0100
+++ b/graphics_plat/guestvideodriver_api/ldd/inc/virtualvideohwchannel.h Wed Aug 25 17:53:16 2010 +0100
@@ -19,7 +19,10 @@
#include <kernel/kernel.h>
#include <kernel/kern_priv.h>
+
+#ifdef FAISALMEMON_S4_SGIMAGE
#include "sgextension.h"//For SgExtension
+#endif
#include "virtualvideohwinterface.h"
@@ -141,7 +144,9 @@
/// Interface to the hardware
DVirtualVideoHwInterface& iHwInterface;
+#ifdef FAISALMEMON_S4_SGIMAGE
TInt GetSgImageMetaData(TSgImageMetaData& aSgInfo, const TUint64 aId);
+#endif
TInt iValue;