Changeset 47049 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 9, 2013 3:17:08 AM (12 years ago)

Author:

vboxsync

Message:

wddm/3d: do not submit TexPresent when host reports it unsupported

Location:

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

Files:

• VBoxMPCr.cpp (modified) (1 diff)
• VBoxMPVdma.cpp (modified) (2 diffs)
• VBoxMPWddm.cpp (modified) (1 diff)
• VBoxMPWddm.h (modified) (1 diff)

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

@@ -882 +882 @@
     }
 
-#ifndef DEBUG_misha
+#if 1 //ndef DEBUG_misha
     /* zero it up temporary to avoid new code activation */
     g_VBoxMpCrHostCaps = 0;

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

@@ -942 +942 @@
         const RTRECT*paRects)
 {
+    Assert(pDevExt->fTexPresentEnabled);
+
     uint32_t cbCommandBuffer = VBOXMP_CRCMD_HEADER_SIZE + VBOXMP_CRCMD_SIZE_VBOXTEXPRESENT(cRects);
     uint32_t cCommands = 1;
@@ -983 +985 @@
 NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId, PVBOXWDDM_ALLOCATION pAllocation)
 {
+    Assert(pDevExt->fTexPresentEnabled);
+
     RTRECT Rect, *pRect = NULL;
     uint32_t cRects = 0;

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

@@ -1168 +1168 @@
 
                     pDevExt->fTexPresentEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_TEX_PRESENT);
+                    Assert(!pDevExt->fTexPresentEnabled);
 
                     for (UINT i = 0; i < (UINT)VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)

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

@@ -168 +168 @@
     }
 
-    if (pAllocation && pAllocation->hostID)
-    {
-        NTSTATUS Status = vboxVdmaTexPresentSetAlloc(pDevExt, srcId, pAllocation);
-        if (!NT_SUCCESS(Status))
+    if (pDevExt->fTexPresentEnabled)
+    {
+        /* only submit TexPresent if host supports it and it is enabled */
+        if (pAllocation && pAllocation->hostID)
         {
-            WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
-        }
-
-        VBoxVrListClear(&pSource->VrList);
-        pSource->fHas3DVrs = TRUE;
-    }
-    else
-    {
-        if (pSource->fHas3DVrs)
-        {
-            NTSTATUS Status = vboxVdmaTexPresentSetAlloc(pDevExt, srcId, NULL);
+            NTSTATUS Status = vboxVdmaTexPresentSetAlloc(pDevExt, srcId, pAllocation);
             if (!NT_SUCCESS(Status))
             {
                 WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
             }
-            pSource->fHas3DVrs = FALSE;
+
+            VBoxVrListClear(&pSource->VrList);
+            pSource->fHas3DVrs = TRUE;
         }
-
-        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
+        {
+            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);
     }