Changeset 81291 in vbox

Timestamp:

Oct 15, 2019 8:23:18 PM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics: LogRel the D3D adapter identifier

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -158 +158 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static void vmsvgaDumpD3DCaps(D3DCAPS9 *pCaps);
+static void vmsvgaDumpD3DCaps(D3DCAPS9 *pCaps, D3DADAPTER_IDENTIFIER9 const *pai9);
 
 
@@ -219 +219 @@
     AssertReturn(hr == D3D_OK, VERR_INTERNAL_ERROR);
 #endif
+    D3DADAPTER_IDENTIFIER9 ai9;
+    hr = pState->pD3D9->GetAdapterIdentifier(D3DADAPTER_DEFAULT, 0, &ai9);
+    AssertReturnStmt(hr == D3D_OK, D3D_RELEASE(pState->pD3D9), VERR_INTERNAL_ERROR);
+
     hr = pState->pD3D9->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &pState->caps);
-    AssertReturn(hr == D3D_OK, VERR_INTERNAL_ERROR);
-
-    vmsvgaDumpD3DCaps(&pState->caps);
+    AssertReturnStmt(hr == D3D_OK, D3D_RELEASE(pState->pD3D9), VERR_INTERNAL_ERROR);
+
+    vmsvgaDumpD3DCaps(&pState->caps, &ai9);
 
     /* Check if INTZ is supported. */
@@ -6215 +6219 @@
 }
 
-static void vmsvgaDumpD3DCaps(D3DCAPS9 *pCaps)
+static void vmsvgaDumpD3DCaps(D3DCAPS9 *pCaps, D3DADAPTER_IDENTIFIER9 const *pai9)
 {
     bool const fBufferingSaved = RTLogRelSetBuffering(true /*fBuffered*/);
+
+    LogRel(("\nD3D9 adapter: %s %RX16:%RX16 [%s, version %d.%d.%d.%d]\n",
+            pai9->Description, pai9->VendorId, pai9->DeviceId, pai9->Driver,
+            RT_HI_U16(pai9->DriverVersion.HighPart), RT_LO_U16(pai9->DriverVersion.HighPart),
+            RT_HI_U16(pai9->DriverVersion.LowPart), RT_LO_U16(pai9->DriverVersion.LowPart)));
 
     LogRel(("\nD3D device caps: DevCaps2:\n"));