Changeset 38143 in vbox for trunk/src

Timestamp:

Jul 25, 2011 10:59:42 AM (13 years ago)

Author:

vboxsync

Message:

crogl: auto-flush on thread switch functionality

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/pack/packspu.h (modified) (1 diff)
• Additions/common/crOpenGL/pack/packspu_context.c (modified) (2 diffs)
• Additions/common/crOpenGL/pack/packspu_misc.c (modified) (2 diffs)
• GuestHost/OpenGL/include/chromium.h (modified) (1 diff)

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

@@ -42 +42 @@
     CRContext *clientState;  /* used to store client-side GL state */
     GLint serverCtx;         /* context ID returned by server */
+    GLboolean  fAutoFlush;
+    ThreadInfo *currentThread;
     GLubyte glVersion[100];     /* GL_VERSION string */
     GLubyte pszRealVendor[100];

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

@@ -213 +213 @@
 }
 
+#define PACK_FORCED_SYNC
 
 void PACKSPU_APIENTRY packspu_MakeCurrent( GLint window, GLint nativeWindow, GLint ctx )
@@ -234 +235 @@
         newCtx = &pack_spu.context[slot];
         CRASSERT(newCtx->clientState);  /* verify valid */
+
+        if (newCtx->fAutoFlush)
+        {
+            if (newCtx->currentThread && newCtx->currentThread != thread)
+            {
+                int writeback = 1;
+                crLockMutex(&_PackMutex);
+                /* do a flush for the previusly assigned thread
+                 * to ensure all commands issued there are submitted */
+                if (newCtx->currentThread
+                    && newCtx->currentThread->inUse
+                    && newCtx->currentThread->netServer.conn
+                    && newCtx->currentThread->packer && newCtx->currentThread->packer->currentBuffer)
+                {
+#ifdef PACK_FORCED_SYNC
+                    CRPackContext *pc = newCtx->currentThread->packer;
+                    unsigned char *data_ptr;
+
+                    CR_GET_BUFFERED_POINTER( pc, 16 );
+                    WRITE_DATA( 0, GLint, 16 );
+                    WRITE_DATA( 4, GLenum, CR_WRITEBACK_EXTEND_OPCODE );
+                    WRITE_NETWORK_POINTER( 8, (void *) &writeback );
+                    WRITE_OPCODE( pc, CR_EXTEND_OPCODE );
+                    CR_UNLOCK_PACKER_CONTEXT(pc);
+#endif
+                    packspuFlush((void *) newCtx->currentThread);
+
+#ifdef PACK_FORCED_SYNC
+                    while (writeback)
+                        crNetRecv();
+#endif
+                }
+                crUnlockMutex(&_PackMutex);
+            }
+            newCtx->currentThread = thread;
+        }
 
         thread->currentContext = newCtx;

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

@@ -401 +401 @@
 }
 
+static void packspuFluchOnThreadSwitch(GLboolean fEnable)
+{
+    GET_THREAD(thread);
+    if (thread->currentContext->fAutoFlush == fEnable)
+        return;
+
+    thread->currentContext->fAutoFlush = fEnable;
+    thread->currentContext->currentThread = fEnable ? thread : NULL;
+}
+
 void PACKSPU_APIENTRY packspu_ChromiumParameteriCR(GLenum target, GLint value)
 {
+    if (GL_FLUSH_ON_THREAD_SWITCH_CR==target)
+    {
+        /* this is a pure packspu state, don't propagate it any further */
+        packspuFluchOnThreadSwitch(value);
+        return;
+    }
     if (GL_SHARE_CONTEXT_RESOURCES_CR==target)
     {
@@ -555 +571 @@
         }
 
+        for (i=0; i<CR_MAX_CONTEXTS; ++i)
+        {
+            ContextInfo *ctx = &pack_spu.context[i];
+            if (ctx->currentThread == thread)
+            {
+                CRASSERT(ctx->fAutoFlush);
+                ctx->currentThread = NULL;
+            }
+        }
+
         crUnlockMutex(&_PackMutex);
     }

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

@@ -688 +688 @@
 /*Global resource ids sharing*/
 #define GL_SHARE_CONTEXT_RESOURCES_CR 0x8B27
+#define GL_FLUSH_ON_THREAD_SWITCH_CR  0x8B28
 
 /**********************************************************************/