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

Timestamp:

May 16, 2012 1:24:25 PM (13 years ago)

Author:

vboxsync

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

78008

Message:

wddm: aero multimon fixes + some cleanup

Location:

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

Files:

• disp/wddm/VBoxDispD3D.cpp (modified) (1 diff)
• mp/common/VBoxMPDevExt.h (modified) (1 diff)
• mp/wddm/VBoxMPWddm.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -5118 +5118 @@
 
         pAllocation->SurfDesc.cbSize = vboxWddmCalcSize(pAllocation->SurfDesc.pitch, pAllocation->SurfDesc.height, pAllocation->SurfDesc.format);
+
+        pAllocation->SurfDesc.VidPnSourceId = pResource->VidPnSourceId;
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

@@ -277 +277 @@
         pAllocation->bVisible = FALSE;
         Assert(pAllocation->SurfDesc.VidPnSourceId == srcId);
-        pAllocation->SurfDesc.VidPnSourceId = srcId;
         pAllocation->bAssigned = TRUE;
     }

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

@@ -5284 +5284 @@
 }
 
-#if 0
-DECLINLINE(bool) vboxWddmCheckForVisiblePrimary(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_ALLOCATION pAllocation)
-{
-    !!!primary could be of pAllocation->enmType == VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC!!!
-    if (pAllocation->enmType != VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE)
-        return false;
-
-    if (!pAllocation->bVisible)
-        return false;
-
-    D3DDDI_VIDEO_PRESENT_SOURCE_ID id = pAllocation->SurfDesc.VidPnSourceId;
-    if (id >= (D3DDDI_VIDEO_PRESENT_SOURCE_ID)VBoxCommonFromDeviceExt(pDevExt)->cDisplays)
-        return false;
-
-    PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[id];
-    if (pSource->pPrimaryAllocation != pAllocation)
-        return false;
-
-    return true;
-}
-#endif
-
 /**
  * DxgkDdiPresent
@@ -5388 +5366 @@
                                     if (pPresent->DmaBufferPrivateDataSize >= sizeof (VBOXWDDM_DMA_PRIVATEDATA_SHADOW2PRIMARY))
                                     {
-                                        VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pDstAlloc->SurfDesc.VidPnSourceId];
-//                                        vboxWddmAssignShadow(pDevExt, pSource, pSrcAlloc, pDstAlloc->SurfDesc.VidPnSourceId);
                                         Assert(pPresent->SrcRect.left == pPresent->DstRect.left);
                                         Assert(pPresent->SrcRect.right == pPresent->DstRect.right);