Changeset 33475 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Oct 26, 2010 5:23:54 PM (14 years ago)

Author:

vboxsync

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

67067

Message:

crOpenGL/wddm: multithreading fix

Location:

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

Files:

• packspu_init.c (modified) (1 diff)
• packspu_net.c (modified) (3 diffs)

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

@@ -70 +70 @@
 packSPUCleanup(void)
 {
+    int i;
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&_PackMutex);
+#endif
+    for (i=0; i<pack_spu.numThreads; ++i)
+    {
+        if (pack_spu.thread[i].packer)
+        {
+            crPackDeleteContext(pack_spu.thread[i].packer);
+        }
+    }
+
+    crFreeTSD(&_PackerTSD);
+    crFreeTSD(&_PackTSD);
+    
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&_PackMutex);
+    crFreeMutex(&_PackMutex);
+#endif
     return 1;
 }

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

@@ -120 +120 @@
     CRPackBuffer *buf;
 
+#ifdef CHROMIUM_THREADSAFE
     crLockMutex(&_PackMutex);
+#endif
 
     /* we should _always_ pass a valid <arg> value */
     CRASSERT(thread);
+#ifdef CHROMIUM_THREADSAFE
+    CR_LOCK_PACKER_CONTEXT(thread->packer);
+#endif
     ctx = thread->currentContext;
     buf = &(thread->buffer);
@@ -145 +150 @@
            crPackSetBuffer( thread->packer, buf );
            crPackResetPointers(thread->packer);
+#ifdef CHROMIUM_THREADSAFE
+           CR_UNLOCK_PACKER_CONTEXT(thread->packer);
            crUnlockMutex(&_PackMutex);
+#endif
            return;
     }
@@ -173 +181 @@
     crPackResetPointers(thread->packer);
 
+#ifdef CHROMIUM_THREADSAFE
+    CR_UNLOCK_PACKER_CONTEXT(thread->packer);
     crUnlockMutex(&_PackMutex);
+#endif
 }