Changeset 82547 in vbox for trunk

Timestamp:

Dec 11, 2019 1:24:35 PM (5 years ago)

Author:

vboxsync

Message:

WDDM: added DXVAHD and WIN7 adapter capabilities, currently disabled

Location:

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

Files:

• common/wddm/VBoxMPIf.h (modified) (1 diff)
• disp/wddm/VBoxDispD3D.cpp (modified) (1 diff)
• disp/wddm/gallium/GaWddm.cpp (modified) (3 diffs)
• mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -569 +569 @@
 #endif /* VBOX_WITH_MESA3D */
 
-#define VBOXWDDM_QAI_CAP_3D   0x00000001 /* 3D is enabled in the VM settings. */
-#define VBOXWDDM_QAI_CAP_DXVA 0x00000002 /* DXVA is not disabled in the guest registry. */
+#define VBOXWDDM_QAI_CAP_3D     0x00000001 /* 3D is enabled in the VM settings. */
+#define VBOXWDDM_QAI_CAP_DXVA   0x00000002 /* DXVA is not disabled in the guest registry. */
+#define VBOXWDDM_QAI_CAP_DXVAHD 0x00000004 /* DXVA-HD is not disabled in the guest registry. */
+#define VBOXWDDM_QAI_CAP_WIN7   0x00000008 /* User mode driver can report D3D_UMD_INTERFACE_VERSION_WIN7. */
 
 /* D3DDDICB_QUERYADAPTERINFO::pPrivateDriverData */

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

@@ -180 +180 @@
             pOpenData->pAdapterFuncs->pfnCreateDevice = GaDdiAdapterCreateDevice;
             pOpenData->pAdapterFuncs->pfnCloseAdapter = GaDdiAdapterCloseAdapter;
-            pOpenData->DriverVersion                  = D3D_UMD_INTERFACE_VERSION_VISTA;
+            pOpenData->DriverVersion                  = RT_BOOL(pAdapterInfo->u32AdapterCaps & VBOXWDDM_QAI_CAP_WIN7)
+                                                      ? D3D_UMD_INTERFACE_VERSION_WIN7
+                                                      : D3D_UMD_INTERFACE_VERSION_VISTA;
         }
 #endif

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

@@ -801 +801 @@
 #endif
 
-HRESULT GaWddmGetD3D9Caps(IDirect3D9Ex *pD3D9If, D3DCAPS9 *pCaps)
+static HRESULT gaWddmGetD3D9Caps(VBOXWDDM_QAI const *pAdapterInfo, IDirect3D9Ex *pD3D9If, D3DCAPS9 *pCaps)
 {
     HRESULT hr = pD3D9If->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, pCaps);
@@ -841 +841 @@
     pCaps->PS20Caps.Caps           |= D3DPS20CAPS_NOTEXINSTRUCTIONLIMIT;
 
+    if (RT_BOOL(pAdapterInfo->u32AdapterCaps & VBOXWDDM_QAI_CAP_DXVAHD))
+        pCaps->Caps3 |=  D3DCAPS3_DXVAHD;
+
 #ifdef DEBUG
     vboxDispCheckCapsLevel(pCaps);
@@ -1168 +1171 @@
         if (SUCCEEDED(hr))
         {
-            hr = GaWddmGetD3D9Caps(pD3D9, &pD3D->Caps);
+            hr = gaWddmGetD3D9Caps(pAdapterInfo, pD3D9, &pD3D->Caps);
             pD3D9->Release();
 

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

@@ -1755 +1755 @@
                     pQAI->u32AdapterCaps = pDevExt->f3DEnabled ? VBOXWDDM_QAI_CAP_3D : 0;
                     pQAI->u32AdapterCaps |= VBOXWDDM_QAI_CAP_DXVA; /** @todo Fetch from registry. */
+                    if (VBoxQueryWinVersion(NULL) >= WINVERSION_7)
+                    {
+                        // pQAI->u32AdapterCaps |= VBOXWDDM_QAI_CAP_WIN7;
+                        // pQAI->u32AdapterCaps |= VBOXWDDM_QAI_CAP_DXVAHD; /** @todo Fetch from registry. */
+                    }
+
                     static int cLoggedCaps = 0;
                     if (cLoggedCaps < 1)
                     {
                         ++cLoggedCaps;
-                        LOGREL_EXACT(("WDDM: addapter capabilities 0x%08X\n", pQAI->u32AdapterCaps));
+                        LOGREL_EXACT(("WDDM: adapter capabilities 0x%08X\n", pQAI->u32AdapterCaps));
                     }
+
                     if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                     {