Changeset 56566 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

Jun 20, 2015 8:10:59 AM (10 years ago)

Author:

vboxsync

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

101192

Message:

Host 3D: Expando SPU, DLM module.

• DLM module reworked. Now it uses hardware way in order to execute Display List (software approach dropped);
• Chromium/utils slightly extended with more helper functions needed for Expando/DLM;
• More testing needed especially for glCallLists() and glListBase();
• Expando/DLM code now enabed for Mac hosts.

Location:

trunk/src/VBox/GuestHost/OpenGL/util

Files:

• hash.c (modified) (2 diffs)
• util.def (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/hash.c

@@ -433 +433 @@
 }
 
+void crFreeHashtableEx(CRHashTable *hash, CRHashtableCallbackEx deleteFunc, void *pData)
+{
+    int i;
+    CRHashNode *entry, *next;
+
+    if (!hash) return;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&hash->mutex);
+#endif
+
+    for (i = 0; i < CR_NUM_BUCKETS; i++)
+    {
+        entry = hash->buckets[i];
+        while (entry)
+        {
+            next = entry->next;
+            /* Clear the key in case crHashtableDelete() is called
+             * from this callback.
+             */
+            entry->key = 0;
+            if (deleteFunc && entry->data)
+            {
+                (*deleteFunc)(entry->data, pData);
+            }
+            crFree(entry);
+            entry = next;
+
+        }
+    }
+    crFreeHashIdPool(hash->idPool);
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&hash->mutex);
+    crFreeMutex(&hash->mutex);
+#endif
+
+    crFree(hash);
+}
+
+
 void crHashtableLock(CRHashTable *h)
 {
@@ -585 +626 @@
 }
 
+void crHashtableDeleteEx(CRHashTable *h, unsigned long key, CRHashtableCallbackEx deleteFunc, void *pData)
+{
+    unsigned int index = crHash( key );
+    CRHashNode *temp, *beftemp = NULL;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&h->mutex);
+#endif
+    for (temp = h->buckets[index]; temp; temp = temp->next)
+    {
+        if (temp->key == key)
+            break;
+        beftemp = temp;
+    }
+    if (temp)
+    {
+        if (beftemp)
+            beftemp->next = temp->next;
+        else
+            h->buckets[index] = temp->next;
+        h->num_elements--;
+        if (temp->data && deleteFunc) {
+            (*deleteFunc)(temp->data, pData);
+        }
+
+        crFree(temp);
+    }
+
+    crHashIdPoolFreeBlock(h->idPool, key, 1);
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&h->mutex);
+#endif
+}
+
+
 void crHashtableDeleteBlock( CRHashTable *h, unsigned long key, GLsizei range, CRHashtableCallback deleteFunc )
 {

trunk/src/VBox/GuestHost/OpenGL/util/util.def

@@ -78 +78 @@
 crHashtableAdd
 crHashtableDelete
+crHashtableDeleteEx
 crHashtableSearch
 crHashtableReplace
@@ -87 +88 @@
 crAllocHashtableEx
 crFreeHashtable
+crFreeHashtableEx
 crHashtableGetDataKey
 crDetermineEndianness