Changeset 20975 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker

Timestamp:

Jun 26, 2009 1:56:25 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix memory leak when using VBOs

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bufferobject.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bufferobject.c

@@ -37 +37 @@
 
 #ifdef IN_GUEST
+    b->retainBufferData = GL_TRUE;
+#else
     b->retainBufferData = GL_FALSE;
-#else
-    b->retainBufferData = GL_TRUE;
 #endif
 
@@ -51 +51 @@
 
 
+static void crStateFreeBufferObject(void *data)
+{
+    CRBufferObject *pObj = (CRBufferObject *)data;
+    if (pObj->data) crFree(pObj->data);
+    crFree(pObj);
+}
+
 void crStateBufferObjectDestroy (CRContext *ctx)
 {
     CRBufferObjectState *b = &ctx->bufferobject;
-    crFreeHashtable(b->buffers, crFree);
+    crFreeHashtable(b->buffers, crStateFreeBufferObject);
     crFree(b->nullBuffer);
 }
@@ -119 +126 @@
 
     if (oldObj->refCount <= 0) {
-        crHashtableDelete(b->buffers, (unsigned long) oldObj->name, crFree);
+        /*we shouldn't reach this point*/
+        CRASSERT(false);
+        crHashtableDelete(b->buffers, (unsigned long) oldObj->name, crStateFreeBufferObject);
     }
 }
@@ -165 +174 @@
                 /* XXX check bindings with the vertex arrays */
 
-                crHashtableDelete(b->buffers, buffers[i], crFree);
+                crHashtableDelete(b->buffers, buffers[i], crStateFreeBufferObject);
             }
         }