Changeset 50928 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Timestamp:

Mar 31, 2014 2:14:11 PM (11 years ago)

Author:

vboxsync

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

93073

Message:

wddm/DevVga/crOpenGL: new command submission working for 3D

Location:

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

Files:

• common/VBoxMPUtils.cpp (modified) (1 diff)
• wddm/VBoxMPVbva.cpp (modified) (2 diffs)
• wddm/VBoxMPWddm.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp

@@ -29 +29 @@
 #ifdef DEBUG_misha
 /* specifies whether the vboxVDbgBreakF should break in the debugger
- * windbg seems to have some issues when there is a lot ( >~50) of sw breakpoints defined
+ * windbg seems to have some issues when there is a lot ( >32) of sw breakpoints defined
  * to simplify things we just insert breaks for the case of intensive debugging WDDM driver*/
 #ifndef VBOX_WDDM_WIN8
-int g_bVBoxVDbgBreakF = false;
-int g_bVBoxVDbgBreakFv = false;
+int g_bVBoxVDbgBreakF = 1;
+int g_bVBoxVDbgBreakFv = 0;
 #else
-int g_bVBoxVDbgBreakF = false;
-int g_bVBoxVDbgBreakFv = false;
+int g_bVBoxVDbgBreakF = 1;
+int g_bVBoxVDbgBreakFv = 0;
 #endif
 #endif

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

@@ -1133 +1133 @@
     uint32_t cbInitBuffer = cbBuffer;
     uint32_t i = 0;
-    VBOXCMDVBVAPAGEIDX *pPageNumbers = pCmd->aPageNumbers;
-
-    cbBuffer -= RT_OFFSETOF(VBOXCMDVBVA_PAGING_TRANSFER, aPageNumbers);
+    VBOXCMDVBVAPAGEIDX *pPageNumbers = pCmd->Data.aPageNumbers;
+
+    cbBuffer -= RT_OFFSETOF(VBOXCMDVBVA_PAGING_TRANSFER, Data.aPageNumbers);
 
     for (; i < cPages && cbBuffer >= sizeof (*pPageNumbers); ++i, cbBuffer -= sizeof (*pPageNumbers))
@@ -1143 +1143 @@
 
     *pcPagesWritten = i;
-    Assert(cbInitBuffer - cbBuffer == RT_OFFSETOF(VBOXCMDVBVA_PAGING_TRANSFER, aPageNumbers[i]));
+    Assert(cbInitBuffer - cbBuffer == RT_OFFSETOF(VBOXCMDVBVA_PAGING_TRANSFER, Data.aPageNumbers[i]));
     return cbInitBuffer - cbBuffer;
 }

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

@@ -3109 +3109 @@
         else
         {
+            Assert(!pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset);
+            Assert(!pSubmitCommand->DmaBufferSubmissionStartOffset);
+
             if (cbCmd < sizeof (VBOXCMDVBVA_HDR))
             {
@@ -3133 +3136 @@
                 return STATUS_INVALID_PARAMETER;
             }
-            SysMem.iPage = (VBOXCMDVBVAPAGEIDX)(pSubmitCommand->DmaBufferPhysicalAddress.QuadPart >> PAGE_SHIFT);
+            SysMem.phCmd = (VBOXCMDVBVAPHADDR)(pSubmitCommand->DmaBufferPhysicalAddress.QuadPart + pSubmitCommand->DmaBufferSubmissionStartOffset);
 
             cbCmd = sizeof (SysMem);
@@ -3142 +3145 @@
     else
     {
+        Assert(!pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset);
+        Assert(!pSubmitCommand->DmaBufferSubmissionStartOffset);
+
         if (cbCmd < sizeof (VBOXCMDVBVA_HDR))
         {
@@ -3153 +3159 @@
         pHdr = (VBOXCMDVBVA_HDR*)((uint8_t*)pSubmitCommand->pDmaBufferPrivateData + pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset);
     }
+
     pHdr->u32FenceID = pSubmitCommand->SubmissionFenceId;
     int rc = VBoxCmdVbvaSubmit(pDevExt, &pDevExt->CmdVbva, pHdr, cbCmd);
@@ -3413 +3420 @@
         case DXGK_OPERATION_TRANSFER:
         {
+            if (!pBuildPagingBuffer->Transfer.Flags.AllocationIsIdle)
+            {
+                WARN(("allocation is not idle"));
+                return STATUS_GRAPHICS_ALLOCATION_BUSY;
+            }
+
+            Assert(!pBuildPagingBuffer->Transfer.MdlOffset);
+
             if ((!pBuildPagingBuffer->Transfer.Source.SegmentId) == (!pBuildPagingBuffer->Transfer.Destination.SegmentId))
             {
@@ -3478 +3493 @@
             offVRAM += pBuildPagingBuffer->Transfer.TransferOffset + (pBuildPagingBuffer->MultipassOffset << PAGE_SHIFT);
 
-            pPaging->Alloc.u.offVRAM = offVRAM;
+            pPaging->Data.Alloc.u.offVRAM = offVRAM;
             if (fIn)
                 pPaging->Hdr.u8Flags |= VBOXCMDVBVA_OPF_PAGING_TRANSFER_IN;