Changeset 20084 in vbox

Timestamp:

May 27, 2009 1:26:41 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: reduce amount of sync calls to speed up d3d

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• load.c (modified) (1 diff)
• pack/packspu.h (modified) (1 diff)
• pack/packspu_flush_special (modified) (1 diff)
• pack/packspu_get.py (modified) (1 diff)
• pack/packspu_misc.c (modified) (1 diff)
• pack/packspu_net.c (modified) (1 diff)
• pack/packspu_special (modified) (1 diff)
• pack/packspu_texture.c (added)
• stub.c (modified) (5 diffs)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -351 +351 @@
         pack/packspu_swapbuf.c \
         pack/packspu_pixel.c \
+        pack/packspu_texture.c \
         $(VBOX_PATH_CROGL_GENFILES)/packspu.c \
         $(VBOX_PATH_CROGL_GENFILES)/packspu_get.c \

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -544 +544 @@
     if (stub_initialized)
         return true;
-    
+
     stubInitVars();
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.h

@@ -83 +83 @@
 extern void packspuHuge( CROpcode opcode, void *buf );
 
+extern GLboolean packspuSyncOnFlushes();
+
 extern ThreadInfo *packspuNewThread( unsigned long id );
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_flush_special

@@ -3 +3 @@
 #
 # See the file LICENSE.txt for information on redistributing this software.
-Flush
 BarrierCreateCR
 BarrierExecCR

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_get.py

@@ -86 +86 @@
             print '\t\tpname == GL_PACK_IMAGE_HEIGHT ||'
             print '#endif'
-            print '\t\tpname == GL_PACK_SKIP_ROWS) {'
+            print '\t\tpname == GL_PACK_SKIP_ROWS'
+            print '\t\t|| pname == GL_DRAW_BUFFER'
+            print '#ifdef CR_OPENGL_VERSION_1_3'
+            print '\t\t|| pname == GL_ACTIVE_TEXTURE'
+            print '#endif'
+            print '#ifdef CR_ARB_multitexture'
+            print '\t\t|| pname == GL_ACTIVE_TEXTURE_ARB'
+            print '#endif'
+            print ') {'
             print '\t\t\tcrState%s( pname, params );' % func_name
             print '\t\t\treturn;'

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -41 +41 @@
 }
 
+GLboolean packspuSyncOnFlushes()
+{
+    GLint buffer;
+    crStateGetIntegerv(GL_DRAW_BUFFER, &buffer);
+    /*Usually buffer==GL_BACK, so put this extra check to simplify boolean eval on runtime*/
+    return  (buffer != GL_BACK)
+            && (buffer == GL_FRONT_LEFT 
+                || buffer == GL_FRONT_RIGHT
+                || buffer == GL_FRONT
+                || buffer == GL_FRONT_AND_BACK
+                || buffer == GL_LEFT
+                || buffer == GL_RIGHT);
+}
+
+void PACKSPU_APIENTRY packspu_DrawBuffer(GLenum mode)
+{
+    crStateDrawBuffer(mode);
+    crPackDrawBuffer(mode);
+}
+
 void PACKSPU_APIENTRY packspu_Finish( void )
 {
     GET_THREAD(thread);
     GLint writeback = pack_spu.thread[0].netServer.conn->actual_network;
-    if (pack_spu.swap)
-    {
-        crPackFinishSWAP(  );
+
+    if (pack_spu.swap)
+    {
+        crPackFinishSWAP();
+    }
+    else
+    {
+        crPackFinish();
+    }
+
+    if (packspuSyncOnFlushes())
+    {
+        packspuFlush( (void *) thread );
+
         if (writeback)
-            crPackWritebackSWAP( &writeback );
-    }
-    else
-    {
-        crPackFinish(  );
-        if (writeback)
-            crPackWriteback( &writeback );
-    }
-    packspuFlush( (void *) thread );
-    while (writeback)
-        crNetRecv();
-}
-
+            if (pack_spu.swap)
+                crPackWritebackSWAP(&writeback);
+            else
+                crPackWriteback(&writeback);
+
+        while (writeback)
+            crNetRecv();
+    }
+}
+
+void PACKSPU_APIENTRY packspu_Flush( void )
+{
+    GET_THREAD(thread);
+    if (pack_spu.swap)
+    {
+        crPackFlushSWAP();
+    }
+    else
+    {
+        crPackFlush();
+    }
+
+    if (packspuSyncOnFlushes())
+    {
+        packspuFlush( (void *) thread );
+    }
+}
 
 GLint PACKSPU_APIENTRY packspu_WindowCreate( const char *dpyName, GLint visBits )

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_net.c

@@ -151 +151 @@
 
     if ( buf->holds_BeginEnd )
+    {
+        /*crDebug("crNetBarf %d, (%d)", len, buf->size);*/
         crNetBarf( thread->netServer.conn, &(buf->pack), hdr, len );
+    }
     else
+    {
+        /*crDebug("crNetSend %d, (%d)", len, buf->size);*/
         crNetSend( thread->netServer.conn, &(buf->pack), hdr, len );
+    }
 
     buf->pack = crNetAlloc( thread->netServer.conn );

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_special

@@ -61 +61 @@
 BufferDataARB
 ZPixCR
+ActiveTextureARB
+DrawBuffer
+Flush

trunk/src/VBox/Additions/common/crOpenGL/stub.c

@@ -14 +14 @@
 #include <X11/extensions/Xfixes.h>
 #endif
+
+static void crForcedFlush()
+{
+    GLint buffer;
+    stub.spu->dispatch_table.GetIntegerv(GL_DRAW_BUFFER, &buffer);
+    stub.spu->dispatch_table.DrawBuffer(GL_FRONT);
+    stub.spu->dispatch_table.Flush();
+    stub.spu->dispatch_table.DrawBuffer(buffer);
+}
 
 /**
@@ -100 +109 @@
         }
 #endif
-        stub.spu->dispatch_table.Flush();
+        crForcedFlush();
 
         crHashtableDelete(stub.windowTable, window, crFree);
@@ -303 +312 @@
                 if (stubUpdateWindowGeometry(winInfo, GL_FALSE) || changed)
                 {
-                    stub.spuDispatch.Flush();
+                    crForcedFlush();
                 }
                 break;
@@ -317 +326 @@
                 if (stub.trackWindowVisibleRgn && stubUpdateWindowVisibileRegions(winInfo))
                 {
-                    stub.spuDispatch.Flush();
+                    crForcedFlush();
                 }
                 break;
@@ -327 +336 @@
                 {
                     crDebug("Visibility info updated due to unknown hooked message (%d)", pMsgInfo->message);
-                    stub.spuDispatch.Flush();
+                    crForcedFlush();
                 }
                 break;