Changeset 47059 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.h

Timestamp:

Jul 9, 2013 4:27:54 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

87103

Message:

wddm/3d: fixes to r0-based presentation

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.h (modified) (4 diffs)

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

@@ -135 +135 @@
 
     pSource->pShadowAllocation = pAllocation;
+
+    Assert(!pSource->AllocData.pSwapchain);
+    Assert(!pSource->AllocData.hostID);
 }
 #endif
@@ -168 +171 @@
     }
 
-    if (pDevExt->fTexPresentEnabled)
-    {
-        /* only submit TexPresent if host supports it and it is enabled */
-        if (pAllocation && pAllocation->hostID)
-        {
-            NTSTATUS Status = vboxVdmaTexPresentSetAlloc(pDevExt, srcId, pAllocation);
-            if (!NT_SUCCESS(Status))
-            {
-                WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
-            }
-
-            VBoxVrListClear(&pSource->VrList);
-            pSource->fHas3DVrs = TRUE;
-        }
-        else
-        {
-            if (pSource->fHas3DVrs)
-            {
-                NTSTATUS Status = vboxVdmaTexPresentSetAlloc(pDevExt, srcId, NULL);
-                if (!NT_SUCCESS(Status))
-                {
-                    WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
-                }
-                pSource->fHas3DVrs = FALSE;
-            }
-
-            RTRECT Rect;
-            Rect.xLeft = 0;
-            Rect.yTop = 0;
-            Rect.xRight = pAllocation ? pAllocation->AllocData.SurfDesc.width : pSource->AllocData.SurfDesc.width;
-            Rect.yBottom = pAllocation ? pAllocation->AllocData.SurfDesc.height : pSource->AllocData.SurfDesc.height;
-
-            VBoxVrListRectsSet(&pSource->VrList, 1, &Rect, NULL);
-        }
-    }
-    else
-    {
-        Assert(!pSource->fHas3DVrs);
-    }
-
     KIRQL OldIrql;
     KeAcquireSpinLock(&pSource->AllocationLock, &OldIrql);
     pSource->pPrimaryAllocation = pAllocation;
     KeReleaseSpinLock(&pSource->AllocationLock, OldIrql);
+
+    Assert(!pSource->AllocData.pSwapchain);
+    Assert(!pSource->AllocData.hostID);
 }
 
@@ -231 +197 @@
 # ifdef VBOX_WDDM_WIN8
 #  define VBOXWDDM_IS_FB_ALLOCATION(_pDevExt, _pAlloc) ( (_pAlloc)->bAssigned \
-        && (  (_pAlloc)->enmType == VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC \
+        && (  (_pAlloc)->AllocData.hostID \
            || (_pAlloc)->enmType == \
                ((g_VBoxDisplayOnly || (_pDevExt)->fRenderToShadowDisabled) ? VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE : VBOXWDDM_ALLOC_TYPE_STD_SHADOWSURFACE) \
@@ -237 +203 @@
 # else
 #  define VBOXWDDM_IS_FB_ALLOCATION(_pDevExt, _pAlloc) ( (_pAlloc)->bAssigned \
-        && (  (_pAlloc)->enmType == VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC \
+        && (  (_pAlloc)->AllocData.hostID \
            || (_pAlloc)->enmType == \
                (((_pDevExt)->fRenderToShadowDisabled) ? VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE : VBOXWDDM_ALLOC_TYPE_STD_SHADOWSURFACE) \