Changeset 30970 in vbox

Timestamp:

Jul 21, 2010 3:26:31 PM (15 years ago)

Author:

vboxsync

Message:

wddm/2d: bugfix, video working (debug still needed)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Files:

• VBoxVideoVdma.cpp (modified) (2 diffs)
• VBoxVideoWddm.cpp (modified) (2 diffs)

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

@@ -565 +565 @@
                     }
                 }
+                else
+                {
+                    AssertBreakpoint();
+                }
             }
         }
@@ -573 +577 @@
     Assert(cNew < UINT32_MAX/2);
 
-    NTSTATUS cmplStatus = vboxWddmDmaCmdNotifyCompletion(pDevExt, pContext, pCF->SubmissionFenceId);
-    Assert(cmplStatus == STATUS_SUCCESS);
     return Status;
 }

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

@@ -2213 +2213 @@
             PVBOXWDDM_DMA_PRESENT_CLRFILL pCF = (PVBOXWDDM_DMA_PRESENT_CLRFILL)pPrivateData;
             PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pSubmitCommand->hContext;
-            PVBOXVDMAPIPE_CMD_DMACMD_CLRFILL pCFCmd = (PVBOXVDMAPIPE_CMD_DMACMD_CLRFILL)vboxVdmaGgCmdCreate(&pDevExt->u.primary.Vdma.DmaGg, VBOXVDMAPIPE_CMD_TYPE_RECTSINFO, RT_OFFSETOF(VBOXVDMAPIPE_CMD_DMACMD_CLRFILL, Rects.aRects[pCF->Rects.cRects]));
+            PVBOXVDMAPIPE_CMD_DMACMD_CLRFILL pCFCmd = (PVBOXVDMAPIPE_CMD_DMACMD_CLRFILL)vboxVdmaGgCmdCreate(&pDevExt->u.primary.Vdma.DmaGg, VBOXVDMAPIPE_CMD_TYPE_DMACMD_CLRFILL, RT_OFFSETOF(VBOXVDMAPIPE_CMD_DMACMD_CLRFILL, Rects.aRects[pCF->Rects.cRects]));
             NTSTATUS submStatus = STATUS_UNSUCCESSFUL;
             Assert(pCFCmd);
@@ -2253 +2253 @@
                     vboxVdmaGgCmdDestroy(&pCFCmd->Hdr);
                 }
-            }
-
-            if (submStatus != STATUS_SUCCESS)
-            {
-                Status = vboxWddmDmaCmdNotifyCompletion(pDevExt, pPrivateData->pContext, pSubmitCommand->SubmissionFenceId);
-            }
-            /* else - command will be completed in the clrfill handler */
+
+            }
+
+            Status = vboxWddmDmaCmdNotifyCompletion(pDevExt, pPrivateData->pContext, pSubmitCommand->SubmissionFenceId);
+            Assert(Status == STATUS_SUCCESS);
 
             break;