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

Timestamp:

Apr 16, 2014 8:35:26 AM (11 years ago)

Author:

vboxsync

Message:

wddm/CrCmd: bugfixes + more correct complex command length info data

Location:

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

Files:

• VBoxMPVbva.cpp (modified) (4 diffs)
• VBoxMPWddm.cpp (modified) (9 diffs)

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

@@ -939 +939 @@
     pCmd->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
 
-    pCmd->u32FenceID = u32FenceID;
+    pCmd->u2.u32FenceID = u32FenceID;
 
     VBoxVBVAExBufferEndUpdate(&pVbva->Vbva);
@@ -1060 +1060 @@
         Assert(pCmd->u8State == VBOXCMDVBVA_STATE_IN_PROGRESS);
 
-        u32SubmitFence = ASMAtomicUoReadU32(&pCmd->u32FenceID);
+        u32SubmitFence = pCmd->u2.u32FenceID;
         break;
     }
@@ -1089 +1089 @@
         VBOXCMDVBVA_HDR *pCmd = (VBOXCMDVBVA_HDR*)pu8Cmd;
         uint8_t u8State = pCmd->u8State;
-        uint32_t u32FenceID = pCmd->u32FenceID;
+        uint32_t u32FenceID = pCmd->u2.u32FenceID;
 
         Assert(u8State == VBOXCMDVBVA_STATE_IN_PROGRESS
@@ -1302 +1302 @@
     pCmd->Cmd.Cmd.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
     pCmd->Cmd.Cmd.u.i8Result = -1;
-    pCmd->Cmd.Cmd.u32FenceID = 0;
+    pCmd->Cmd.Cmd.u2.u32FenceID = 0;
 
     return (VBOXCMDVBVA_CRCMD_CMD*)(pCmd+1);

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

@@ -3123 +3123 @@
         NopCmd.u8Flags = 0;
         NopCmd.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-        NopCmd.u32FenceID = sizeof (VBOXCMDVBVA_HDR);
+        NopCmd.u2.complexCmdEl.u16CbCmdHost = sizeof (VBOXCMDVBVA_HDR);
+        NopCmd.u2.complexCmdEl.u16CbCmdGuest = 0;
         cbCmd = sizeof (VBOXCMDVBVA_HDR);
         pHdr = &NopCmd;
@@ -3132 +3133 @@
     {
         pHdr = (VBOXCMDVBVA_HDR*)(((uint8_t*)pSubmitCommand->pDmaBufferPrivateData) + pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset);
-        cbCurCmd = pHdr->u32FenceID & 0xff;
-        cbCurDma = pHdr->u32FenceID >> 16;
+        cbCurCmd = pHdr->u2.complexCmdEl.u16CbCmdHost;
+        cbCurDma = pHdr->u2.complexCmdEl.u16CbCmdGuest;
     }
 
@@ -3201 +3202 @@
 
         memcpy(pCurDstCmd, pHdr, cbCurCmd);
-        pCurDstCmd->u32FenceID = cbCurCmd;
+        pCurDstCmd->u2.complexCmdEl.u16CbCmdGuest = 0;
 
         phAddr.QuadPart += cbCurDma;
@@ -3225 +3226 @@
         }
 
-        cbCurCmd = pHdr->u32FenceID & 0xff;
-        cbCurDma = pHdr->u32FenceID >> 16;
+        cbCurCmd = pHdr->u2.complexCmdEl.u16CbCmdHost;
+        cbCurDma = pHdr->u2.complexCmdEl.u16CbCmdGuest;
 
         if (cbCmd < cbCurCmd)
@@ -3555 +3556 @@
                 pHdr->u.u8PrimaryID = 0;
                 pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-                pHdr->u32FenceID = cbPrivateData | (cbBuffer << 16);
+                pHdr->u2.complexCmdEl.u16CbCmdHost = cbPrivateData;
+                pHdr->u2.complexCmdEl.u16CbCmdGuest = cbBuffer;
                 break;
             }
@@ -3630 +3632 @@
             pSysMemCmd->Hdr.u.u8PrimaryID = (cbBuffer >> 8) & 0xff;
             pSysMemCmd->Hdr.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-            pSysMemCmd->Hdr.u32FenceID = cbPrivateData | (cbBuffer << 16);
+            pSysMemCmd->Hdr.u2.complexCmdEl.u16CbCmdHost = cbPrivateData;
+            pSysMemCmd->Hdr.u2.complexCmdEl.u16CbCmdGuest = cbBuffer;
             pSysMemCmd->phCmd = 0;
 
@@ -3661 +3664 @@
             pHdr->u.u8PrimaryID = 0;
             pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-            pHdr->u32FenceID = cbPrivateData | (cbBuffer << 16);
+            pHdr->u2.complexCmdEl.u16CbCmdHost = cbPrivateData;
+            pHdr->u2.complexCmdEl.u16CbCmdGuest = cbBuffer;
 
             /** @todo: add necessary bits */
@@ -6090 +6094 @@
 
         pCmd->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-        pCmd->u32FenceID = cbPrivateData | (cbBuffer << 16);
+        pCmd->u2.complexCmdEl.u16CbCmdHost = cbPrivateData;
+        pCmd->u2.complexCmdEl.u16CbCmdGuest = cbBuffer;
     }
     __except (EXCEPTION_EXECUTE_HANDLER)
@@ -6643 +6648 @@
     pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
 
-    pHdr->u32FenceID = cbPrivateData | (cbBuffer << 16);
+    pHdr->u2.complexCmdEl.u16CbCmdHost = cbPrivateData;
+    pHdr->u2.complexCmdEl.u16CbCmdGuest = cbBuffer;
 
     Assert(cbBuffer);