Changeset 42060 in vbox for trunk

Timestamp:

Jul 9, 2012 1:33:54 PM (13 years ago)

Author:

vboxsync

Message:

wddm/display-only: more impl

Location:

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

Files:

• common/VBoxMPUtils.cpp (modified) (1 diff)
• wddm/VBoxMPWddm.cpp (modified) (4 diffs)
• wddm/VBoxVideoW8.inf (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp

@@ -31 +31 @@
  * windbg seems to have some issues when there is a lot ( >~50) of sw breakpoints defined
  * to simplify things we just insert breaks for the case of intensive debugging WDDM driver*/
+#ifndef VBOX_WDDM_WIN8
 bool g_bVBoxVDbgBreakF = false;
 bool g_bVBoxVDbgBreakFv = false;
+#else
+bool g_bVBoxVDbgBreakF = true;
+bool g_bVBoxVDbgBreakFv = true;
+#endif
 #endif
 

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

@@ -1128 +1128 @@
                         KeInitializeSpinLock(&pSource->AllocationLock);
                     }
+
+#ifdef VBOX_WDDM_WIN8
+                    DXGK_DISPLAY_INFORMATION DisplayInfo;
+                    Status = pDevExt->u.primary.DxgkInterface.DxgkCbAcquirePostDisplayOwnership(pDevExt->u.primary.DxgkInterface.DeviceHandle,
+                            &DisplayInfo);
+                    if (!NT_SUCCESS(Status))
+                    {
+                        WARN(("DxgkCbAcquirePostDisplayOwnership failed, Status 0x%x", Status));
+                    }
+#endif
                 }
                 else
@@ -1773 +1783 @@
             DXGK_DRIVERCAPS *pCaps = (DXGK_DRIVERCAPS*)pQueryAdapterInfo->pOutputData;
 
+            memset(pCaps, 0, sizeof (*pCaps));
+
             pCaps->HighestAcceptableAddress.QuadPart = ~((uintptr_t)0);
+#ifndef VBOX_WDDM_WIN8
             pCaps->MaxAllocationListSlotId = 16;
             pCaps->ApertureSegmentCommitLimit = 0;
@@ -1807 +1820 @@
             /* @todo: this correlates with pCaps->SchedulingCaps.MultiEngineAware */
             pCaps->GpuEngineTopology.NbAsymetricProcessingNodes = VBOXWDDM_NUM_NODES;
-
+#else
+            pCaps->WDDMVersion = DXGKDDI_WDDMv1_2;
+#endif
             break;
         }
+#ifndef VBOX_WDDM_WIN8
         case DXGKQAITYPE_QUERYSEGMENT:
         {
@@ -1886 +1902 @@
             }
             break;
+#endif /* #ifndef VBOX_WDDM_WIN8 */
         default:
-            LOGREL(("unsupported Type (%d)", pQueryAdapterInfo->Type));
-            AssertBreakpoint();
+            WARN(("unsupported Type (%d)", pQueryAdapterInfo->Type));
             Status = STATUS_NOT_SUPPORTED;
             break;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxVideoW8.inf

@@ -145 +145 @@
 ORACLE = "Oracle Corporation"
 VBoxVideo.Disk = "VirtualBox Video Driver Disk"
-VBoxVideo.SvcDesc = "VirtualBox Graphics Adapter (Microsoft Corporation - WDDM)"
+VBoxVideo.SvcDesc = "VirtualBox Graphics Adapter WDDM 1.2"