Changeset 38405 in vbox for trunk/src

Timestamp:

Aug 10, 2011 3:04:33 PM (13 years ago)

Author:

vboxsync

Message:

wddm: propper context destruction

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Files:

• VBoxMPMisc.cpp (modified) (1 diff)
• VBoxMPWddm.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

@@ -375 +375 @@
 {
     VBOXWDDM_HTABLE_ITERATOR Iter;
-    bool fRestart = false;
     do
     {
         ExAcquireFastMutex(&pDevExt->ContextMutex);
         vboxWddmHTableIterInit(&pContext->Swapchains, &Iter);
-        do
-        {
-            PVBOXWDDM_SWAPCHAIN pSwapchain = (PVBOXWDDM_SWAPCHAIN)vboxWddmHTableIterNext(&Iter, NULL);
-            if (!pSwapchain)
-                break;
-
-            /* yes, we can call remove locked even when using iterator */
-            vboxWddmSwapchainCtxRemoveLocked(pDevExt, pContext, pSwapchain);
-    //        vboxWddmHTableIterRemoveCur(&Iter);
-
-            ExReleaseFastMutex(&pDevExt->ContextMutex);
-            /* we must not do vboxWddmSwapchainDestroy inside a context mutex */
-            vboxWddmSwapchainDestroy(pDevExt, pSwapchain);
-            fRestart = true;
-        } while (1);
-    } while (fRestart);
+        PVBOXWDDM_SWAPCHAIN pSwapchain = (PVBOXWDDM_SWAPCHAIN)vboxWddmHTableIterNext(&Iter, NULL);
+        if (!pSwapchain)
+            break;
+
+        /* yes, we can call remove locked even when using iterator */
+        vboxWddmSwapchainCtxRemoveLocked(pDevExt, pContext, pSwapchain);
+
+        ExReleaseFastMutex(&pDevExt->ContextMutex);
+        /* we must not do vboxWddmSwapchainDestroy inside a context mutex */
+        vboxWddmSwapchainDestroy(pDevExt, pSwapchain);
+        /* start from the very beginning, we will quit the loop when no swapchains left */
+    } while (1);
+
+    /* no swapchains left, we exiteed the while loop via the "break", and we still owning the mutex */
     ExReleaseFastMutex(&pDevExt->ContextMutex);
 }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -5500 +5500 @@
     }
 
+    /* first terminate the swapchain, this will also ensure
+     * all currently pending driver->user Cm commands
+     * (i.e. visible regions commands) are completed */
+    vboxWddmSwapchainCtxTerm(pDevExt, pContext);
+
     NTSTATUS Status = vboxVideoAMgrCtxDestroy(&pContext->AllocContext);
     Assert(Status == STATUS_SUCCESS);
@@ -5508 +5513 @@
         if (Status == STATUS_SUCCESS)
         {
-            vboxWddmSwapchainCtxTerm(pDevExt, pContext);
             vboxWddmMemFree(pContext);
         }