Changeset 43487 in vbox for trunk/src/VBox/GuestHost/OpenGL/packer

Timestamp:

Oct 1, 2012 11:53:15 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

81047

Message:

crOpenGL/wddm: basics for miniport-based visible rects processing (guest part); export flushToHost command

Location:

trunk/src/VBox/GuestHost/OpenGL/packer

Files:

• pack_buffer.c (modified) (3 diffs)
• pack_visibleregion.c (modified) (2 diffs)
• packer.py (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/packer/pack_buffer.c

@@ -150 +150 @@
         CRPackBuffer *buf = pc->currentBuffer;
         CRASSERT(buf);
-        crPackInitBuffer( buf, buf->pack, buf->size, buf->mtu );
+        crPackInitBuffer( buf, buf->pack, buf->size, buf->mtu
+#ifdef IN_RING0
+                , 0
+#endif
+                );
         pc->buffer.geometry_only = geom_only;   /* restore the flag */
         pc->buffer.holds_BeginEnd = holds_BeginEnd;
@@ -222 +226 @@
  *              be somewhat smaller than the buffer size.
  */
-void crPackInitBuffer( CRPackBuffer *buf, void *pack, int size, int mtu )
-{
+void crPackInitBuffer( CRPackBuffer *buf, void *pack, int size, int mtu
+#ifdef IN_RING0
+        , unsigned int num_opcodes
+#endif
+        )
+{
+#ifndef IN_RING0
         unsigned int num_opcodes;
+#endif
 
         CRASSERT(mtu <= size);
@@ -232 +242 @@
         buf->pack = pack;
 
-        num_opcodes = crPackMaxOpcodes( buf->size );
+#ifdef IN_RING0
+        if(!num_opcodes)
+#endif
+        {
+            num_opcodes = crPackMaxOpcodes( buf->size );
+        }
 
         buf->data_start    = 

trunk/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c

@@ -23 +23 @@
 #endif
 
-void PACK_APIENTRY crPackWindowVisibleRegion( GLint window, GLint cRects, GLint * pRects )
+void PACK_APIENTRY crPackWindowVisibleRegion( CR_PACKER_CONTEXT_ARGDECL GLint window, GLint cRects, GLint * pRects )
 {
     GLint i, size, cnt;
@@ -50 +50 @@
 }
 
-void PACK_APIENTRY crPackWindowVisibleRegionSWAP( GLint window, GLint cRects, GLint * pRects )
+void PACK_APIENTRY crPackWindowVisibleRegionSWAP( CR_PACKER_CONTEXT_ARGDECL  GLint window, GLint cRects, GLint * pRects )
 {
     crError( "crPackWindowVisibleRegionSWAP unimplemented and shouldn't be called" );

trunk/src/VBox/GuestHost/OpenGL/packer/packer.py

@@ -114 +114 @@
     """Emit a packer function."""
     if is_swapped:
-        print 'void PACK_APIENTRY crPack%sSWAP( %s )' % (func_name, apiutil.MakeDeclarationString(params))
-    else:
-        print 'void PACK_APIENTRY crPack%s( %s )' % (func_name, apiutil.MakeDeclarationString(params))
+        print 'void PACK_APIENTRY crPack%sSWAP( %s )' % (func_name, apiutil.MakeDeclarationStringWithContext('CR_PACKER_CONTEXT', params))
+    else:
+        print 'void PACK_APIENTRY crPack%s( %s )' % (func_name, apiutil.MakeDeclarationStringWithContext('CR_PACKER_CONTEXT', params))
     print '{'
     print '\tCR_GET_PACKER_CONTEXT(pc);'