Changeset 33714 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp

Timestamp:

Nov 2, 2010 11:36:10 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: CrHgsmi cleanup, free resources correctly; 2D fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp

@@ -920 +920 @@
 }
 
+static void vboxVhwaHlpOverlayListAdd(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_OVERLAY pOverlay)
+{
+    PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pOverlay->VidPnSourceId];
+    KIRQL OldIrql;
+    KeAcquireSpinLock(&pSource->OverlayListLock, &OldIrql);
+    ASMAtomicIncU32(&pSource->cOverlays);
+    InsertHeadList(&pSource->OverlayList, &pOverlay->ListEntry);
+    KeReleaseSpinLock(&pSource->OverlayListLock, OldIrql);
+}
+
+static void vboxVhwaHlpOverlayListRemove(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_OVERLAY pOverlay)
+{
+    PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pOverlay->VidPnSourceId];
+    KIRQL OldIrql;
+    KeAcquireSpinLock(&pSource->OverlayListLock, &OldIrql);
+    ASMAtomicDecU32(&pSource->cOverlays);
+    RemoveEntryList(&pOverlay->ListEntry);
+    KeReleaseSpinLock(&pSource->OverlayListLock, OldIrql);
+}
+
 AssertCompile(sizeof (RECT) == sizeof (VBOXVHWA_RECTL));
 AssertCompile(RT_SIZEOFMEMB(RECT, left) == RT_SIZEOFMEMB(VBOXVHWA_RECTL, left));
@@ -930 +950 @@
 AssertCompile(RT_OFFSETOF(RECT, bottom) == RT_OFFSETOF(VBOXVHWA_RECTL, bottom));
 
-int vboxVhwaHlpOverlayUpdate(PVBOXWDDM_OVERLAY pOverlay, const DXGK_OVERLAYINFO *pOverlayInfo)
+int vboxVhwaHlpOverlayUpdate(PVBOXWDDM_OVERLAY pOverlay, const DXGK_OVERLAYINFO *pOverlayInfo, RECT * pDstUpdateRect)
 {
     PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pOverlayInfo->hAllocation;
@@ -982 +1002 @@
             if (pOurInfo->DirtyRegion.fFlags & VBOXWDDM_DIRTYREGION_F_VALID)
             {
-                pBody->u.in.xUpdatedSrcMemValid = 1;
                 if (pOurInfo->DirtyRegion.fFlags & VBOXWDDM_DIRTYREGION_F_RECT_VALID)
                     pBody->u.in.xUpdatedSrcMemRect = *(VBOXVHWA_RECTL*)((void*)&pOurInfo->DirtyRegion.Rect);
@@ -993 +1012 @@
             }
 
+            if (pDstUpdateRect)
+            {
+                pBody->u.in.xUpdatedDstMemRect = *(VBOXVHWA_RECTL*)((void*)pDstUpdateRect);
+            }
+
             /* we're not interested in completion, just send the command */
             vboxVhwaCommandSubmitAsynchAndComplete(pOverlay->pDevExt, pCmd);
@@ -1011 +1035 @@
 }
 
+int vboxVhwaHlpOverlayUpdate(PVBOXWDDM_OVERLAY pOverlay, const DXGK_OVERLAYINFO *pOverlayInfo)
+{
+    return vboxVhwaHlpOverlayUpdate(pOverlay, pOverlayInfo, NULL);
+}
+
 int vboxVhwaHlpOverlayDestroy(PVBOXWDDM_OVERLAY pOverlay)
 {
     int rc = VINF_SUCCESS;
+
+    vboxVhwaHlpOverlayListRemove(pOverlay->pDevExt, pOverlay);
+
     for (uint32_t i = 0; i < pOverlay->pResource->cAllocations; ++i)
     {
@@ -1066 +1098 @@
             pOverlay->pResource = pRc;
             pOverlay->VidPnSourceId = VidPnSourceId;
-            rc = vboxVhwaHlpOverlayUpdate(pOverlay, pOverlayInfo);
+
+            vboxVhwaHlpOverlayListAdd(pDevExt, pOverlay);
+#ifdef VBOXWDDM_RENDER_FROM_SHADOW
+            RECT DstRect;
+            vboxVhwaHlpOverlayDstRectGet(pDevExt, pOverlay, &DstRect);
+            NTSTATUS Status = vboxVdmaHlpUpdatePrimary(pDevExt, VidPnSourceId, &DstRect);
+            Assert(Status == STATUS_SUCCESS);
+            /* ignore primary update failure */
+            Status = STATUS_SUCCESS;
+#endif
+            rc = vboxVhwaHlpOverlayUpdate(pOverlay, pOverlayInfo, &DstRect);
             if (!RT_SUCCESS(rc))
             {
@@ -1089 +1131 @@
     PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[VidPnSourceId];
     return !ASMAtomicReadU32(&pSource->cOverlays);
-}
-
-void vboxVhwaHlpOverlayListAdd(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_OVERLAY pOverlay)
-{
-    PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pOverlay->VidPnSourceId];
-    KIRQL OldIrql;
-    KeAcquireSpinLock(&pSource->OverlayListLock, &OldIrql);
-    ASMAtomicIncU32(&pSource->cOverlays);
-    InsertHeadList(&pSource->OverlayList, &pOverlay->ListEntry);
-    KeReleaseSpinLock(&pSource->OverlayListLock, OldIrql);
-}
-
-void vboxVhwaHlpOverlayListRemove(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_OVERLAY pOverlay)
-{
-    PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pOverlay->VidPnSourceId];
-    KIRQL OldIrql;
-    KeAcquireSpinLock(&pSource->OverlayListLock, &OldIrql);
-    ASMAtomicDecU32(&pSource->cOverlays);
-    RemoveEntryList(&pOverlay->ListEntry);
-    KeReleaseSpinLock(&pSource->OverlayListLock, OldIrql);
 }