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

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

Location:

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

Files:

• VBoxMPCr.cpp (modified) (1 diff)
• VBoxMPMisc.cpp (modified) (1 diff)
• VBoxMPMisc.h (modified) (1 diff)
• VBoxMPVdma.cpp (modified) (10 diffs)
• VBoxMPVdma.h (modified) (1 diff)
• VBoxMPWddm.cpp (modified) (6 diffs)

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

@@ -893 +893 @@
     }
 
-#if 1 //ndef DEBUG_misha
+#ifndef DEBUG_misha
     /* zero it up temporary to avoid new code activation */
     g_VBoxMpCrHostCaps = 0;

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

@@ -242 +242 @@
 }
 
-PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAlloc(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_ALLOCATION pAlloc)
+PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOCATION *pAlloc)
 {
     return vboxWddmSwapchainRetainByAllocData(pDevExt, &pAlloc->AllocData);

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

@@ -74 +74 @@
 BOOLEAN vboxWddmSwapchainRetain(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain);
 VOID vboxWddmSwapchainRelease(PVBOXWDDM_SWAPCHAIN pSwapchain);
-PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAlloc(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_ALLOCATION pAlloc);
+PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOCATION *pAlloc);
 PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAllocData(PVBOXMP_DEVEXT pDevExt, const struct VBOXWDDM_ALLOC_DATA *pAllocData);
 VOID vboxWddmSwapchainAllocRemove(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain, PVBOXWDDM_ALLOCATION pAlloc);

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);
 }

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

@@ -334 +334 @@
 NTSTATUS vboxVdmaProcessClrFillCmd(PVBOXMP_DEVEXT pDevExt, struct VBOXWDDM_CONTEXT *pContext, struct VBOXWDDM_DMA_PRIVATEDATA_CLRFILL *pCF);
 
-NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData);
+NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_ALLOCATION pRealFbAlloc);
 
 #endif /* #ifndef ___VBoxMPVdma_h___ */

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

@@ -270 +270 @@
 }
 
-NTSTATUS vboxWddmGhDisplaySetInfo(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData, const POINT * pVScreenPos)
+NTSTATUS vboxWddmGhDisplaySetInfo(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_ALLOCATION pRealFbAlloc, const VBOXWDDM_ALLOC_DATA *pAllocData, const POINT * pVScreenPos)
 {
     NTSTATUS Status = vboxWddmGhDisplaySetMode(pDevExt, pAllocData);
@@ -283 +283 @@
                 if (pDevExt->f3DEnabled)
                 {
-                    Status = vboxVdmaTexPresentSetAlloc(pDevExt, pAllocData);
+                    Status = vboxVdmaTexPresentSetAlloc(pDevExt, pRealFbAlloc);
                     if (NT_SUCCESS(Status))
                         return STATUS_SUCCESS;
@@ -311 +311 @@
     char fGhSynced = 1;
     PVBOXWDDM_ALLOCATION pFbAlloc = VBOXWDDM_FB_ALLOCATION(pDevExt, pSource);
+    PVBOXWDDM_ALLOCATION pRealFbAlloc = pSource->pPrimaryAllocation;
 #ifdef VBOXWDDM_RENDER_FROM_SHADOW
 # ifdef VBOX_WDDM_WIN8
@@ -339 +340 @@
     Assert(!pFbAlloc || pFbAlloc->AllocData.Addr.SegmentId == pSource->AllocData.Addr.SegmentId);
 
-    NTSTATUS Status = vboxWddmGhDisplaySetInfo(pDevExt, pFbAlloc ? &pFbAlloc->AllocData : &pSource->AllocData, &pSource->VScreenPos);
+    NTSTATUS Status = vboxWddmGhDisplaySetInfo(pDevExt, pRealFbAlloc, pFbAlloc ? &pFbAlloc->AllocData : &pSource->AllocData, &pSource->VScreenPos);
     if (NT_SUCCESS(Status))
         pSource->fGhSynced = fGhSynced;
@@ -1428 +1429 @@
         uint32_t flags = VBoxCommonFromDeviceExt(pDevExt)->hostCtx.pfHostFlags->u32HostFlags;
         bOur = (flags & HGSMIHOSTFLAGS_IRQ);
+
+        if (bOur)
+            VBoxHGSMIClearIrq(&VBoxCommonFromDeviceExt(pDevExt)->hostCtx);
+
         do
         {
@@ -1559 +1564 @@
             }
 
-            VBoxHGSMIClearIrq(&VBoxCommonFromDeviceExt(pDevExt)->hostCtx);
 #if 0 //def DEBUG_misha
             /* this is not entirely correct since host may concurrently complete some commands and raise a new IRQ while we are here,