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

Timestamp:

Nov 3, 2019 3:49:20 PM (5 years ago)

Author:

vboxsync

Message:

WDDM: miniport should tell the user mode driver whether 3D is enabled for the VM

Location:

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

Files:

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

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

@@ -36 +36 @@
 
 /* One would increase this whenever definitions in this file are changed */
-#define VBOXVIDEOIF_VERSION 21
+#define VBOXVIDEOIF_VERSION 22
 
 /** @todo VBOXVIDEO_HWTYPE probably needs to be in VBoxVideo.h */
@@ -569 +569 @@
 #endif /* VBOX_WITH_MESA3D */
 
+#define VBOXWDDM_QAI_CAP_3D 0x00000001 /* 3D is enabled in the VM settings. */
+
 /* D3DDDICB_QUERYADAPTERINFO::pPrivateDriverData */
 typedef struct VBOXWDDM_QAI
@@ -575 +577 @@
     uint32_t            u32Reserved;     /* Must be 0. */
     VBOXVIDEO_HWTYPE    enmHwType;       /* Hardware type. Determines what kind of data is returned. */
+    uint32_t            u32AdapterCaps;  /* VBOXWDDM_QAI_CAP_* */
     uint32_t            cInfos;          /* Number of initialized elements in aInfos (equal to number of guest
                                           * displays). 0 if VBOX_WITH_VIDEOHWACCEL is not defined. */

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

@@ -114 +114 @@
         pAdapter->u32VBox3DCaps = pAdapterInfo->u.vbox.u32VBox3DCaps;
     pAdapter->AdapterInfo = *pAdapterInfo;
-    pAdapter->f3D         = !vboxDispIsDDraw(pOpenData);
+    pAdapter->f3D         =    RT_BOOL(pAdapterInfo->u32AdapterCaps & VBOXWDDM_QAI_CAP_3D)
+                            && !vboxDispIsDDraw(pOpenData);
 #ifdef VBOX_WITH_VIDEOHWACCEL
     pAdapter->cHeads      = pAdapterInfo->cInfos;

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

@@ -4965 +4965 @@
                 else
                 {
-                    AssertFailed();
                     memset(pData->pData, 0, sizeof (D3DCAPS9));
                 }

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

@@ -2000 +2000 @@
                     pQAI->u32Version = VBOXVIDEOIF_VERSION;
                     pQAI->enmHwType = pDevExt->enmHwType;
+                    pQAI->u32AdapterCaps = pDevExt->f3DEnabled ? VBOXWDDM_QAI_CAP_3D : 0;
                     if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                     {