Changeset 33879 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Nov 8, 2010 10:47:34 PM (14 years ago)

Author:

vboxsync

Message:

wddm: more multi-monitor fixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispD3D.cpp (modified) (2 diffs)
• Miniport/VBoxVideo.cpp (modified) (3 diffs)
• Miniport/wddm/VBoxVideoVidPn.cpp (modified) (1 diff)
• Miniport/wddm/VBoxVideoWddm.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -3471 +3471 @@
     IDirect3DDevice9 * pDevice9If = VBOXDISP_D3DEV(pDevice);
     IDirect3DPixelShader9 *pShader = (IDirect3DPixelShader9*)hShaderHandle;
-    Assert(pShader);
     HRESULT hr = pDevice9If->SetPixelShader(pShader);
     Assert(hr == S_OK);
@@ -6255 +6254 @@
     IDirect3DDevice9 * pDevice9If = VBOXDISP_D3DEV(pDevice);
     IDirect3DVertexShader9 *pShader = (IDirect3DVertexShader9*)hShaderHandle;
-    Assert(pShader);
     HRESULT hr = pDevice9If->SetVertexShader(pShader);
     Assert(hr == S_OK);

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -588 +588 @@
     return display;
 }
+
+static bool vboxVideoModesMatch(VIDEO_MODE_INFORMATION *pMode1, VIDEO_MODE_INFORMATION *pMode2)
+{
+    return pMode1->VisScreenHeight == pMode2->VisScreenHeight
+            && pMode1->VisScreenWidth == pMode2->VisScreenWidth
+            && pMode1->BitsPerPlane == pMode2->BitsPerPlane;
+}
+
+static DECLINLINE(void) vboxVideoChackModeAdd(VIDEO_MODE_INFORMATION *pModes, int *pcNumModes)
+{
+    const int cNumModes = *pcNumModes;
+    for (int i = 0; i < cNumModes; ++i)
+    {
+        if (vboxVideoModesMatch(&pModes[i], &pModes[cNumModes]))
+            return;
+    }
+    (*pcNumModes)++;
+}
+
+#ifdef VBOX_WITH_WDDM
+# define VBOXVIDEOMODE_ADDED(_aModes, _pcModes) vboxVideoChackModeAdd(_aModes, _pcModes)
+#else
+# define VBOXVIDEOMODE_ADDED(_aModes, _pcModes) do { (*(_pcModes))++; } while (0)
+#endif
 
 static int vboxVideoBuildModesTable(PDEVICE_EXTENSION DeviceExtension, int iDisplay,
@@ -1142 +1166 @@
             VideoModes[cNumVideoModes].VideoMemoryBitmapHeight      = yres - yOffset;
             VideoModes[cNumVideoModes].DriverSpecificAttributeFlags = 0;
-            ++cNumVideoModes;
+
+            VBOXVIDEOMODE_ADDED(VideoModes, &cNumVideoModes);
 
             /* next run */
@@ -1194 +1219 @@
             VideoModes[cNumVideoModes] = CustomVideoModes[iDisplay];
             iPreferredVideoMode = cNumVideoModes;
-            ++cNumVideoModes;
+
+            VBOXVIDEOMODE_ADDED(VideoModes, &cNumVideoModes);
         }
 

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

@@ -1257 +1257 @@
                     break;
                 case D3DKMDT_EPT_NOPIVOT:
-                    /* just create and populate the new source mode set for now */
-                    Status = vboxVidPnCreatePopulateSourceModeSetFromLegacy(pDevExt, hDesiredVidPn, pVidPnInterface,
-                            pNewVidPnPresentPathInfo->VidPnSourceId,
-                            pModes, cModes, iPreferredMode, NULL);
-                    Assert(Status == STATUS_SUCCESS);
-                    if (Status == STATUS_SUCCESS)
+                    Assert(!!pPinnedVidPnSourceModeInfo == !!pPinnedVidPnTargetModeInfo);
+                    if (!pPinnedVidPnSourceModeInfo && !pPinnedVidPnTargetModeInfo)
                     {
-                        /* just create and populate a new target mode info for now */
-                        Status = vboxVidPnCreatePopulateTargetModeSetFromLegacy(pDevExt, hDesiredVidPn, pVidPnInterface,
-                                pNewVidPnPresentPathInfo->VidPnTargetId,
-                                pResolutions,
-                                cResolutions,
-                                pPreferredMode,
-                                0,
-                                NULL);
+                        /* just create and populate the new source mode set for now */
+                        Status = vboxVidPnCreatePopulateSourceModeSetFromLegacy(pDevExt, hDesiredVidPn, pVidPnInterface,
+                                pNewVidPnPresentPathInfo->VidPnSourceId,
+                                pModes, cModes, iPreferredMode, NULL);
                         Assert(Status == STATUS_SUCCESS);
-                        if (Status != STATUS_SUCCESS)
-                            drprintf((__FUNCTION__": vboxVidPnCreatePopulateTargetModeSetFromLegacy failed Status(0x%x)\n", Status));
+                        if (Status == STATUS_SUCCESS)
+                        {
+                            /* just create and populate a new target mode info for now */
+                            Status = vboxVidPnCreatePopulateTargetModeSetFromLegacy(pDevExt, hDesiredVidPn, pVidPnInterface,
+                                    pNewVidPnPresentPathInfo->VidPnTargetId,
+                                    pResolutions,
+                                    cResolutions,
+                                    pPreferredMode,
+                                    0,
+                                    NULL);
+                            Assert(Status == STATUS_SUCCESS);
+                            if (Status != STATUS_SUCCESS)
+                                drprintf((__FUNCTION__": vboxVidPnCreatePopulateTargetModeSetFromLegacy failed Status(0x%x)\n", Status));
+                        }
+                        else
+                            drprintf((__FUNCTION__": vboxVidPnCreatePopulateSourceModeSetFromLegacy failed Status(0x%x)\n", Status));
                     }
-                    else
-                        drprintf((__FUNCTION__": vboxVidPnCreatePopulateSourceModeSetFromLegacy failed Status(0x%x)\n", Status));
-
                     break;
                 default:

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

@@ -3719 +3719 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;