Changeset 55831 in vbox

Timestamp:

May 12, 2015 4:18:04 PM (9 years ago)

Author:

vboxsync

Message:

SharedOpenGL: crServerRedirMuralFbClear must release textures.

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• presenter/server_presenter.cpp (modified) (1 diff)
• server_muralfbo.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.cpp

@@ -1182 +1182 @@
 int CrFbEntryCreateForTexData(CR_FRAMEBUFFER *pFb, struct CR_TEXDATA *pTex, uint32_t fFlags, HCR_FRAMEBUFFER_ENTRY *phEntry)
 {
+    if (pTex == NULL)
+    {
+        WARN(("pTex is NULL"));
+        return VERR_INVALID_PARAMETER;
+    }
+
     RTRECT Rect;
     Rect.xLeft = 0;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.cpp

@@ -126 +126 @@
         }
 
-        for (j = 0; j < mural->cBuffers; ++j)
-        {
-            CrTdRelease(pData->apTexDatas[j]);
-            pData->apTexDatas[j] = NULL;
+        /* Release all valid texture data structures in the array.
+         * Do not rely on mural->cBuffers because it might be already
+         * set to zero in crServerDeleteMuralFBO.
+         */
+        for (j = 0; j < RT_ELEMENTS(pData->apTexDatas); ++j)
+        {
+            if (pData->apTexDatas[j] != NULL)
+            {
+                CrTdRelease(pData->apTexDatas[j]);
+                pData->apTexDatas[j] = NULL;
+            }
         }
 
@@ -203 +210 @@
         pData->hFb = hFb;
 
+        RT_ZERO(pData->apTexDatas);
         for (uint32_t i = 0; i < mural->cBuffers; ++i)
         {