Changeset 94385 in vbox

Timestamp:

Mar 28, 2022 4:55:20 PM (3 years ago)

Author:

vboxsync

Message:

Devices,SVGA: Fix some memory leaks in the OpenGL backend

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-ogl.cpp (modified) (4 diffs)
• shaderlib/glsl_shader.c (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -1230 +1230 @@
     pState->pszOtherExtensions = NULL;
 
+    /* Free all leftover surface states. */
+    for (uint32_t i = 0; i < pState->cSurfaces; i++)
+    {
+        AssertPtr(pState->papSurfaces[i]);
+        RTMemFree(pState->papSurfaces[i]);
+        pState->papSurfaces[i] = NULL;
+    }
+
+    /* Destroy all leftover contexts. */
+    for (uint32_t i = 0; i < pState->cContexts; i++)
+    {
+        AssertPtr(pState->papContexts[i]);
+        RTMemFree(pState->papContexts[i]);
+        pState->papContexts[i] = NULL;
+    }
+
+    if (pState->papSurfaces)
+    {
+        RTMemFree(pState->papSurfaces);
+        pState->papSurfaces = NULL;
+    }
+
+    if (pState->papContexts)
+    {
+        RTMemFree(pState->papContexts);
+        pState->papContexts = NULL;
+    }
+
+    pThisCC->svga.p3dState = NULL;
+    RTMemFree(pState);
     return VINF_SUCCESS;
 }
@@ -3453 +3483 @@
     GLXContext shareContext = pSharedCtx ? pSharedCtx->glxContext : NULL;
     pContext->glxContext = glXCreateContext(pState->display, vi, shareContext, GL_TRUE);
+    XFree(vi);
     AssertLogRelMsgReturn(pContext->glxContext, ("glXCreateContext failed"), VERR_INTERNAL_ERROR);
 #endif
@@ -7502 +7533 @@
         {
             pShader = &pContext->paVertexShader[shid];
+            if (pContext->state.shidVertex == shid)
+            {
+                rc = ShaderSetVertexShader(pContext->pShaderContext, NULL);
+                AssertRC(rc);
+            }
+
             rc = ShaderDestroyVertexShader(pContext->pShaderContext, pShader->u.pVertexShader);
             AssertRC(rc);
@@ -7513 +7550 @@
         {
             pShader = &pContext->paPixelShader[shid];
+            if (pContext->state.shidPixel == shid)
+            {
+                ShaderSetPixelShader(pContext->pShaderContext, NULL);
+                AssertRC(rc);
+            }
+
             rc = ShaderDestroyPixelShader(pContext->pShaderContext, pShader->u.pPixelShader);
             AssertRC(rc);

trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c

@@ -358 +358 @@
 #endif
     WDLOG(("\n"));
+#ifdef VBOX
+    HeapFree(GetProcessHeap(), 0, source);
+#endif
 }