Changeset 47566 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp

Timestamp:

Aug 6, 2013 10:20:23 PM (12 years ago)

Author:

vboxsync

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

87766

Message:

crOpenGL/wddm: TexPresent fixes, irq handling fix

File:

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

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

@@ -992 +992 @@
         VBOXMP_CRPACKER *pCrPacker,
         uint32_t u32CrConClientID,
-        const VBOXWDDM_ALLOC_DATA *pSrcAllocData,
-        const VBOXWDDM_ALLOC_DATA *pDstAllocData,
+        const VBOXWDDM_ALLOCATION *pSrcAlloc,
+        const VBOXWDDM_ALLOCATION *pDstAlloc,
         const RECT *pSrcRect, const VBOXVDMAPIPE_RECTS *pDstRects)
 {
-    D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId = pDstAllocData->SurfDesc.VidPnSourceId;
+    D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId = pDstAlloc->AllocData.SurfDesc.VidPnSourceId;
     VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[srcId];
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1003 +1003 @@
     {
         /* we care only about screen regions */
-        if (pDstAllocData != &pSource->pPrimaryAllocation->AllocData)
+        if (pDstAlloc != pSource->pPrimaryAllocation)
         {
             WARN(("non-primary allocation passed to vboxWddmSubmitBltCmd!"));
@@ -1009 +1009 @@
         }
 
-        uint32_t hostID = pSrcAllocData->hostID;
+        uint32_t hostID = pSrcAlloc->AllocData.hostID;
         int rc;
         if (hostID)
@@ -1029 +1029 @@
                 WARN(("vboxVdmaTexPresentSubmit failed Status 0x%x", Status));
         }
-        else if (&pSource->pPrimaryAllocation->AllocData == pDstAllocData)
+        else if (pSource->pPrimaryAllocation == pDstAlloc)
         {
             bool fChanged = false;
@@ -1049 +1049 @@
                                 if (Rect.xLeft == 0
                                         && Rect.yTop == 0
-                                        && Rect.xRight == pDstAllocData->SurfDesc.width
-                                        && Rect.yBottom == pDstAllocData->SurfDesc.height)
+                                        && Rect.xRight == pDstAlloc->AllocData.SurfDesc.width
+                                        && Rect.yBottom == pDstAlloc->AllocData.SurfDesc.height)
                                 {
                                     pSource->fHas3DVrs = FALSE;
@@ -1072 +1072 @@
     else
     {
-        PVBOXWDDM_SWAPCHAIN pSwapchain = vboxWddmSwapchainRetainByAllocData(pDevExt, pSrcAllocData);
+        PVBOXWDDM_SWAPCHAIN pSwapchain = vboxWddmSwapchainRetainByAlloc(pDevExt, pSrcAlloc);
 
         if (pSwapchain)
         {
-            Assert(pSrcAllocData->SurfDesc.width == pSwapchain->width);
-            Assert(pSrcAllocData->SurfDesc.height == pSwapchain->height);
+            Assert(pSrcAlloc->AllocData.SurfDesc.width == pSwapchain->width);
+            Assert(pSrcAlloc->AllocData.SurfDesc.height == pSwapchain->height);
         }
 
@@ -1091 +1091 @@
 }
 
-NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData)
+NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_ALLOCATION pRealFbAlloc)
 {
     VBOXMP_CRPACKER CrPacker;
@@ -1107 +1107 @@
     Rect.left = 0;
     Rect.top = 0;
-    Rect.right = pAllocData->SurfDesc.width;
-    Rect.bottom = pAllocData->SurfDesc.height;
+    Rect.right = pRealFbAlloc->AllocData.SurfDesc.width;
+    Rect.bottom = pRealFbAlloc->AllocData.SurfDesc.height;
 
     VBOXVDMAPIPE_RECTS RectInfo;
@@ -1116 +1116 @@
 
     return vboxVdmaProcessVReg(pDevExt, &CrPacker, u32CrConClientID,
-            pAllocData, pAllocData,
+            pRealFbAlloc, pRealFbAlloc,
             &Rect, &RectInfo);
 }
@@ -1126 +1126 @@
 {
     return vboxVdmaProcessVReg(pDevExt, &pContext->CrPacker, pContext->u32CrConClientID,
-            &pSrcAllocInfo->pAlloc->AllocData, &pDstAllocInfo->pAlloc->AllocData,
+            pSrcAllocInfo->pAlloc, pDstAllocInfo->pAlloc,
             pSrcRect, pDstRects);
 }