Changeset 42028 in vbox for trunk/src/VBox/GuestHost/OpenGL/include

Timestamp:

Jul 5, 2012 3:22:55 PM (13 years ago)

Author:

vboxsync

Message:

wddm/crOpenGL: moreon kernel-based cr commands submission

File:

• trunk/src/VBox/GuestHost/OpenGL/include/cr_pack.h (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_pack.h

@@ -80 +80 @@
 };
 
+#if !defined(IN_RING0)
+# define CR_PACKER_CONTEXT_ARGSINGLEDECL
+# define CR_PACKER_CONTEXT_ARGDECL
+# define CR_PACKER_CONTEXT_ARG
+# define CR_PACKER_CONTEXT_ARGCTX(C)
+# ifdef CHROMIUM_THREADSAFE
+extern CRtsd _PackerTSD;
+#  define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = (CRPackContext *) crGetTSD(&_PackerTSD)
+#  define CR_LOCK_PACKER_CONTEXT(PC) crLockMutex(&((PC)->mutex))
+#  define CR_UNLOCK_PACKER_CONTEXT(PC) crUnlockMutex(&((PC)->mutex))
+# else
+extern DLLDATA(CRPackContext) cr_packer_globals;
+#  define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = &cr_packer_globals
+#  define CR_LOCK_PACKER_CONTEXT(PC)
+#  define CR_UNLOCK_PACKER_CONTEXT(PC)
+# endif
+#else /* if defined IN_RING0 */
+# define CR_PACKER_CONTEXT_ARGSINGLEDECL CRPackContext *_pCtx
+# define CR_PACKER_CONTEXT_ARGDECL CR_PACKER_CONTEXT_ARGSINGLEDECL,
+# define CR_PACKER_CONTEXT_ARG _pCtx,
+# define CR_PACKER_CONTEXT_ARGCTX(C) C,
+# define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = _pCtx
+# define CR_LOCK_PACKER_CONTEXT(PC)
+# define CR_UNLOCK_PACKER_CONTEXT(PC)
+#endif
 
 extern DECLEXPORT(CRPackContext *) crPackNewContext(int swapping);
@@ -106 +131 @@
                                 GLfloat *xmax, GLfloat *ymax, GLfloat *zmax);
 
-extern DECLEXPORT(void) crPackAppendBuffer( const CRPackBuffer *buffer );
-extern DECLEXPORT(void) crPackAppendBoundedBuffer( const CRPackBuffer *buffer, const CRrecti *bounds );
-extern DECLEXPORT(int) crPackCanHoldBuffer( const CRPackBuffer *buffer );
-extern DECLEXPORT(int) crPackCanHoldBoundedBuffer( const CRPackBuffer *buffer );
+extern DECLEXPORT(void) crPackAppendBuffer( CR_PACKER_CONTEXT_ARGDECL const CRPackBuffer *buffer );
+extern DECLEXPORT(void) crPackAppendBoundedBuffer( CR_PACKER_CONTEXT_ARGDECL const CRPackBuffer *buffer, const CRrecti *bounds );
+extern DECLEXPORT(int) crPackCanHoldBuffer( CR_PACKER_CONTEXT_ARGDECL const CRPackBuffer *buffer );
+extern DECLEXPORT(int) crPackCanHoldBoundedBuffer( CR_PACKER_CONTEXT_ARGDECL const CRPackBuffer *buffer );
 
 #if defined(LINUX) || defined(WINDOWS)
@@ -119 +144 @@
 extern DECLEXPORT(void) crWriteSwappedDouble( void *buffer, double d );
 
-extern DECLEXPORT(void) *crPackAlloc( unsigned int len );
-extern DECLEXPORT(void) crHugePacket( CROpcode op, void *ptr );
-extern DECLEXPORT(void) crPackFree( void *ptr );
+extern DECLEXPORT(void) *crPackAlloc( CR_PACKER_CONTEXT_ARGDECL unsigned int len );
+extern DECLEXPORT(void) crHugePacket( CR_PACKER_CONTEXT_ARGDECL CROpcode op, void *ptr );
+extern DECLEXPORT(void) crPackFree( CR_PACKER_CONTEXT_ARGDECL void *ptr );
 extern DECLEXPORT(void) crNetworkPointerWrite( CRNetworkPointer *, void * );
 
@@ -144 +169 @@
 extern DECLEXPORT(void) crPackExpandMultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount, CRClientState *c );
 extern DECLEXPORT(void) crPackExpandMultiDrawElementsEXTSWAP( GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount, CRClientState *c );
-
-
-#ifdef CHROMIUM_THREADSAFE
-extern CRtsd _PackerTSD;
-#define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = (CRPackContext *) crGetTSD(&_PackerTSD)
-#define CR_LOCK_PACKER_CONTEXT(PC) crLockMutex(&((PC)->mutex))
-#define CR_UNLOCK_PACKER_CONTEXT(PC) crUnlockMutex(&((PC)->mutex))
-#elif !defined IN_RING0
-extern DLLDATA(CRPackContext) cr_packer_globals;
-#define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = &cr_packer_globals
-#define CR_LOCK_PACKER_CONTEXT(PC)
-#define CR_UNLOCK_PACKER_CONTEXT(PC)
-#endif