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

Timestamp:

Aug 18, 2010 1:59:09 PM (15 years ago)

Author:

vboxsync

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

64945

Message:

wddm: multimonitor fixes

Location:

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

Files:

• VBoxVideoVbva.cpp (modified) (3 diffs)
• VBoxVideoVbva.h (modified) (1 diff)
• VBoxVideoVdma.cpp (modified) (1 diff)
• VBoxVideoWddm.cpp (modified) (2 diffs)

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

@@ -346 +346 @@
 
 
-int vboxVbvaReportDirtyRect (PDEVICE_EXTENSION pDevExt, VBOXVBVAINFO *pVbva, RECT *pRectOrig)
+int vboxVbvaReportDirtyRect (PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SOURCE pSrc, RECT *pRectOrig)
 {
         VBVACMDHDR hdr;
@@ -352 +352 @@
         RECT rect = *pRectOrig;
 
-        if (rect.left < 0) rect.left = 0;
-        if (rect.top < 0) rect.top = 0;
+//        if (rect.left < 0) rect.left = 0;
+//        if (rect.top < 0) rect.top = 0;
 //        if (rect.right > (int)ppdev->cxScreen) rect.right = ppdev->cxScreen;
 //        if (rect.bottom > (int)ppdev->cyScreen) rect.bottom = ppdev->cyScreen;
@@ -362 +362 @@
         hdr.h = (uint16_t)(rect.bottom - rect.top);
 
-//        hdr.x += (int16_t)ppdev->ptlDevOrg.x;
-//        hdr.y += (int16_t)ppdev->ptlDevOrg.y;
-
-        return vboxWrite (pDevExt, pVbva, &hdr, sizeof(hdr));
+        hdr.x += (int16_t)pSrc->VScreenPos.x;
+        hdr.y += (int16_t)pSrc->VScreenPos.y;
+
+        return vboxWrite (pDevExt, &pSrc->Vbva, &hdr, sizeof(hdr));
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVbva.h

@@ -29 +29 @@
 int vboxVbvaCreate(struct _DEVICE_EXTENSION* pDevExt, VBOXVBVAINFO *pVbva, ULONG offBuffer, ULONG cbBuffer, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId);
 int vboxVbvaReportCmdOffset (struct _DEVICE_EXTENSION* pDevExt, VBOXVBVAINFO *pVbva, uint32_t offCmd);
-int vboxVbvaReportDirtyRect (struct _DEVICE_EXTENSION* pDevExt, VBOXVBVAINFO *pVbva, RECT *pRectOrig);
+int vboxVbvaReportDirtyRect (struct _DEVICE_EXTENSION* pDevExt, struct VBOXWDDM_SOURCE *pSrc, RECT *pRectOrig);
 BOOL vboxVbvaBufferBeginUpdate (struct _DEVICE_EXTENSION* pDevExt, VBOXVBVAINFO *pVbva);
 void vboxVbvaBufferEndUpdate (struct _DEVICE_EXTENSION* pDevExt, VBOXVBVAINFO *pVbva);
 
-#define VBOXVBVA_OP(_op, _pdext, _pvbva, _arg) \
+#define VBOXVBVA_OP(_op, _pdext, _psrc, _arg) \
         do { \
-            if (vboxVbvaBufferBeginUpdate(_pdext, _pvbva)) \
+            if (vboxVbvaBufferBeginUpdate(_pdext, &(_psrc)->Vbva)) \
             { \
-                vboxVbva##_op(_pdext, _pvbva, _arg); \
-                vboxVbvaBufferEndUpdate(_pdext, _pvbva); \
+                vboxVbva##_op(_pdext, _psrc, _arg); \
+                vboxVbvaBufferEndUpdate(_pdext, &(_psrc)->Vbva); \
             } \
         } while (0)
 
-#define VBOXVBVA_OP_WITHLOCK_ATDPC(_op, _pdext, _pvbva, _arg) \
+#define VBOXVBVA_OP_WITHLOCK_ATDPC(_op, _pdext, _psrc, _arg) \
         do { \
-            KeAcquireSpinLockAtDpcLevel(&(_pvbva)->Lock);  \
-            VBOXVBVA_OP(_op, _pdext, _pvbva, _arg);        \
-            KeReleaseSpinLockFromDpcLevel(&(_pvbva)->Lock);\
+            KeAcquireSpinLockAtDpcLevel(&(_psrc)->Vbva.Lock);  \
+            VBOXVBVA_OP(_op, _pdext, _psrc, _arg);        \
+            KeReleaseSpinLockFromDpcLevel(&(_psrc)->Vbva.Lock);\
         } while (0)
 
-#define VBOXVBVA_OP_WITHLOCK(_op, _pdext, _pvbva, _arg) \
+#define VBOXVBVA_OP_WITHLOCK(_op, _pdext, _psrc, _arg) \
         do { \
             KIRQL OldIrql; \
-            KeAcquireSpinLock(&(_pvbva)->Lock, &OldIrql);  \
-            VBOXVBVA_OP(_op, _pdext, _pvbva, _arg);        \
-            KeReleaseSpinLock(&(_pvbva)->Lock, OldIrql);   \
+            KeAcquireSpinLock(&(_psrc)->Vbva.Lock, &OldIrql);  \
+            VBOXVBVA_OP(_op, _pdext, _psrc, _arg);        \
+            KeReleaseSpinLock(&(_psrc)->Vbva.Lock, OldIrql);   \
         } while (0)
 

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

@@ -562 +562 @@
                     {
                         PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pCF->VidPnSourceId];
-                        vboxWddmRectTranslate(&UnionRect, pSource->VScreenPos.x, pSource->VScreenPos.y);
-                        VBOXVBVA_OP_WITHLOCK(ReportDirtyRect, pDevExt, &pSource->Vbva, &UnionRect);
+                        VBOXVBVA_OP_WITHLOCK(ReportDirtyRect, pDevExt, pSource, &UnionRect);
                     }
                 }

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

@@ -2124 +2124 @@
             vboxWddmCheckUpdateShadowAddress(pDevExt, pSource, pPrivateData->SrcAllocInfo.segmentIdAlloc, pPrivateData->SrcAllocInfo.offAlloc);
             PVBOXWDDM_DMA_PRESENT_RENDER_FROM_SHADOW pRFS = (PVBOXWDDM_DMA_PRESENT_RENDER_FROM_SHADOW)pPrivateData;
-            vboxWddmRectTranslate(&pRFS->rect, pSource->VScreenPos.x, pSource->VScreenPos.y);
             uint32_t cDMACmdsOutstanding = ASMAtomicReadU32(&pDevExt->cDMACmdsOutstanding);
             if (!cDMACmdsOutstanding)
-                VBOXVBVA_OP(ReportDirtyRect, pDevExt, &pSource->Vbva, &pRFS->rect);
+                VBOXVBVA_OP(ReportDirtyRect, pDevExt, pSource, &pRFS->rect);
             else
             {
                 Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
-                VBOXVBVA_OP_WITHLOCK_ATDPC(ReportDirtyRect, pDevExt, &pSource->Vbva, &pRFS->rect);
+                VBOXVBVA_OP_WITHLOCK_ATDPC(ReportDirtyRect, pDevExt, pSource, &pRFS->rect);
             }
             /* get DPC data at IRQL */
@@ -2177 +2176 @@
                                     rect = pBlt->DstRects.ContextRect;
 
-                                vboxWddmRectTranslate(&rect, pSource->VScreenPos.x, pSource->VScreenPos.y);
-
                                 uint32_t cDMACmdsOutstanding = ASMAtomicReadU32(&pDevExt->cDMACmdsOutstanding);
                                 if (!cDMACmdsOutstanding)
-                                    VBOXVBVA_OP(ReportDirtyRect, pDevExt, &pSource->Vbva, &rect);
+                                    VBOXVBVA_OP(ReportDirtyRect, pDevExt, pSource, &rect);
                                 else
                                 {
                                     Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
-                                    VBOXVBVA_OP_WITHLOCK_ATDPC(ReportDirtyRect, pDevExt, &pSource->Vbva, &rect);
+                                    VBOXVBVA_OP_WITHLOCK_ATDPC(ReportDirtyRect, pDevExt, pSource, &rect);
                                 }
                                 vboxWddmSubmitBltCmd(pDevExt, pSource, pContext, pBlt);