Changeset 40309 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 1, 2012 9:56:01 AM (13 years ago)

Author:

vboxsync

Message:

wddm/3d: disible rects fix

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp (modified) (11 diffs)

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

@@ -1653 +1653 @@
 #define PVBOXWDDMVR_REG_FROM_ENTRY(_pEntry) ((PVBOXWDDMVR_REG)(((uint8_t*)(_pEntry)) - RT_OFFSETOF(VBOXWDDMVR_REG, ListEntry)))
 
+#ifdef DEBUG_misha
+# define VBOXVDBG_VR_LAL_DISABLE
+#endif
+
+#ifndef VBOXVDBG_VR_LAL_DISABLE
 static LOOKASIDE_LIST_EX g_VBoxWddmVrLookasideList;
+#endif
 
 static PVBOXWDDMVR_REG vboxWddmVrRegCreate()
 {
+#ifndef VBOXVDBG_VR_LAL_DISABLE
     PVBOXWDDMVR_REG pReg = (PVBOXWDDMVR_REG)ExAllocateFromLookasideListEx(&g_VBoxWddmVrLookasideList);
     if (!pReg)
@@ -1663 +1670 @@
     }
     return pReg;
+#else
+    return (PVBOXWDDMVR_REG)vboxWddmMemAlloc(sizeof (VBOXWDDMVR_REG));
+#endif
 }
 
 static void vboxWddmVrRegTerm(PVBOXWDDMVR_REG pReg)
 {
+#ifndef VBOXVDBG_VR_LAL_DISABLE
     ExFreeToLookasideListEx(&g_VBoxWddmVrLookasideList, pReg);
+#else
+    vboxWddmMemFree(pReg);
+#endif
 }
 
@@ -1686 +1700 @@
 NTSTATUS VBoxWddmVrInit()
 {
+#ifndef VBOXVDBG_VR_LAL_DISABLE
     NTSTATUS Status = ExInitializeLookasideListEx(&g_VBoxWddmVrLookasideList,
                             NULL, /* PALLOCATE_FUNCTION_EX Allocate */
@@ -1700 +1715 @@
         return Status;
     }
+#endif
+
     return STATUS_SUCCESS;
 }
@@ -1705 +1722 @@
 void VBoxWddmVrTerm()
 {
+#ifndef VBOXVDBG_VR_LAL_DISABLE
     ExDeleteLookasideListEx(&g_VBoxWddmVrLookasideList);
+#endif
 }
 
@@ -1890 +1909 @@
 typedef FNVBOXWDDMVR_CB_INTERSECTED_VISITOR *PFNVBOXWDDMVR_CB_INTERSECTED_VISITOR;
 
-static void vboxWddmVrListVisitIntersected(PVBOXWDDMVR_LIST pList1, UINT cRects, const RECT *aRects, BOOLEAN fRectsNonintersectedOrdered, PFNVBOXWDDMVR_CB_INTERSECTED_VISITOR pfnVisitor, void* pvVisitor)
+static void vboxWddmVrListVisitIntersected(PVBOXWDDMVR_LIST pList1, UINT cRects, const RECT *aRects, PFNVBOXWDDMVR_CB_INTERSECTED_VISITOR pfnVisitor, void* pvVisitor)
 {
     PLIST_ENTRY pEntry1 = pList1->ListHead.Flink;
@@ -1904 +1923 @@
             const RECT *pRect2 = &aRects[i];
             if (pReg1->Rect.bottom <= pRect2->top)
-            {
-                if (fRectsNonintersectedOrdered)
-                    break; /* the forthcomming rects won't intersect as well since they have at least not bigget top */
-                else
-                    continue; /* no assumptions, just continue */
-            }
+                continue;
             else if (pRect2->bottom <= pReg1->Rect.top)
-            {
-                if (fRectsNonintersectedOrdered)
-                {
-                    iFirst2 = i + 1; /* the previous rects including this one have top < pRect2->bottom,
-                                      * while the forhtcoming pRegs will have top >= pReg1->Rect.top
-                                      * so we can start with the next rect next time */
-                }
                 continue;
-            }
             /* y coords intersect */
             else if (pReg1->Rect.right <= pRect2->left)
@@ -2112 +2118 @@
 }
 
-static NTSTATUS vboxWddmVrListSubstNoJoin(PVBOXWDDMVR_LIST pList, UINT cRects, const PRECT aRects, BOOLEAN fRectsNonintersectedOrdered, BOOLEAN *pfChanged)
+static NTSTATUS vboxWddmVrListSubstNoJoin(PVBOXWDDMVR_LIST pList, UINT cRects, const PRECT aRects, BOOLEAN *pfChanged)
 {
     if (VBoxWddmVrListIsEmpty(pList))
@@ -2123 +2129 @@
     *pfChanged = FALSE;
 
-    vboxWddmVrListVisitIntersected(pList, cRects, aRects, fRectsNonintersectedOrdered, vboxWddmVrListSubstNoJoinCb, &Data);
+    vboxWddmVrListVisitIntersected(pList, cRects, aRects, vboxWddmVrListSubstNoJoinCb, &Data);
     if (!NT_SUCCESS(Data.Status))
     {
@@ -2217 +2223 @@
 #endif
 
-    NTSTATUS Status = vboxWddmVrListSubstNoJoin(pList, cRects, aRects,
-            FALSE, /* rects can be of any type, i.e. can intersect and can NOT be ordered */
-            pfChanged);
+    NTSTATUS Status = vboxWddmVrListSubstNoJoin(pList, cRects, aRects, pfChanged);
     if (!NT_SUCCESS(Status))
     {
@@ -2337 +2341 @@
 
         BOOLEAN fDummyChanged = FALSE;
-        Status = vboxWddmVrListSubstNoJoin(&DiffList, cListRects, pListRects, TRUE, &fDummyChanged);
+        Status = vboxWddmVrListSubstNoJoin(&DiffList, cListRects, pListRects, &fDummyChanged);
         if (!NT_SUCCESS(Status))
         {