Changeset 22831 in vbox for trunk

Timestamp:

Sep 8, 2009 11:13:06 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix GPU memory leak for apps not clearing VBOs/FBOs and incorrect FBO tracking

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_bufferobject.c (modified) (1 diff)
• state_framebuffer.c (modified) (3 diffs)

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

@@ -55 +55 @@
     CRBufferObject *pObj = (CRBufferObject *)data;
     if (pObj->data) crFree(pObj->data);
+
+    if (diff_api.AlphaFunc)
+    {
+        diff_api.DeleteBuffersARB(1, &pObj->name);
+    }
+
     crFree(pObj);
 }

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

@@ -44 +44 @@
 }
 
+static void crStateFreeFBO(void *data)
+{
+    CRFramebufferObject *pObj = (CRFramebufferObject *)data;
+
+    if (diff_api.AlphaFunc)
+    {
+        diff_api.DeleteFramebuffersEXT(1, &pObj->id);
+    }
+
+    crFree(pObj);
+}
+
+static void crStateFreeRBO(void *data)
+{
+    CRRenderbufferObject *pObj = (CRRenderbufferObject *)data;
+
+    if (diff_api.AlphaFunc)
+    {
+        diff_api.DeleteRenderbuffersEXT(1, &pObj->id);
+    }
+
+    crFree(pObj);
+}
+
 DECLEXPORT(void) STATE_APIENTRY
 crStateFramebufferObjectDestroy(CRContext *ctx)
@@ -52 +76 @@
     fbo->renderbuffer = NULL;
 
-    crFreeHashtable(fbo->framebuffers, crFree);
-    crFreeHashtable(fbo->renderbuffers, crFree);
+    crFreeHashtable(fbo->framebuffers, crStateFreeFBO);
+    crFreeHashtable(fbo->renderbuffers, crStateFreeRBO);
 }
 
@@ -246 +270 @@
         {
             fbo->framebuffer = (CRFramebufferObject*) crCalloc(sizeof(CRFramebufferObject));
-            CRSTATE_FBO_CHECKERR(!fbo->renderbuffer, GL_OUT_OF_MEMORY, "glBindFramebufferEXT");
+            CRSTATE_FBO_CHECKERR(!fbo->framebuffer, GL_OUT_OF_MEMORY, "glBindFramebufferEXT");
             fbo->framebuffer->id = framebuffer;
             crStateInitFrameBuffer(fbo->framebuffer);