Changeset 74477 in vbox for trunk

Timestamp:

Sep 26, 2018 12:47:25 PM (6 years ago)

Author:

vboxsync

Message:

WDDM: renamed VBOXVIDEO_HWTYPE_CROGL to VBOXVIDEO_HWTYPE_VBOX. bugref:8893

Location:

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

Files:

• common/wddm/VBoxMPIf.h (modified) (2 diffs)
• disp/wddm/VBoxDispD3D.cpp (modified) (2 diffs)
• disp/wddm/VBoxDispD3DIf.cpp (modified) (1 diff)
• disp/wddm/VBoxUhgsmiKmt.cpp (modified) (1 diff)
• mp/wddm/VBoxMPVdma.cpp (modified) (2 diffs)
• mp/wddm/VBoxMPWddm.cpp (modified) (16 diffs)

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

@@ -38 +38 @@
 typedef enum VBOXVIDEO_HWTYPE
 {
-    VBOXVIDEO_HWTYPE_CROGL  = 0,
+    VBOXVIDEO_HWTYPE_VBOX   = 0,
     VBOXVIDEO_HWTYPE_VMSVGA = 1,
     VBOXVIDEO_HWTYPE_32BIT  = 0x7fffffff
@@ -514 +514 @@
         struct
         {
-            /* VBOXVIDEO_HWTYPE_CROGL */
+            /* VBOXVIDEO_HWTYPE_VBOX */
             uint32_t    u32VBox3DCaps;   /* CR_VBOX_CAP_* */
-        } crogl;
+        } vbox;
     } u;
 } VBOXWDDM_QAI;

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

@@ -5802 +5802 @@
         if (pDevice->pDevice9If)
         {
-            if (pDevice->pAdapter->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+            if (pDevice->pAdapter->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                 pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9Term((IDirect3DDevice9Ex *)pDevice->pDevice9If);
         }
@@ -6572 +6572 @@
     pAdapter->RtCallbacks = *pOpenData->pAdapterCallbacks;
     pAdapter->enmHwType   = pAdapterInfo->enmHwType;
-    if (pAdapter->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
-        pAdapter->u32VBox3DCaps = pAdapterInfo->u.crogl.u32VBox3DCaps;
+    if (pAdapter->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
+        pAdapter->u32VBox3DCaps = pAdapterInfo->u.vbox.u32VBox3DCaps;
     pAdapter->AdapterInfo = *pAdapterInfo;
 #ifdef VBOX_WITH_VIDEOHWACCEL

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

@@ -1262 +1262 @@
 
     HRESULT hr;
-    if (pAdapterInfo->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+    if (pAdapterInfo->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
         hr = vboxDispD3DGlobalDoOpenWine(pD3D);
     else

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

@@ -331 +331 @@
     }
 
-    if (Query.enmHwType == VBOXVIDEO_HWTYPE_CROGL)
-        *pu32Caps = Query.u.crogl.u32VBox3DCaps;
+    if (Query.enmHwType == VBOXVIDEO_HWTYPE_VBOX)
+        *pu32Caps = Query.u.vbox.u32VBox3DCaps;
     else
         *pu32Caps = 0;

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

@@ -1182 +1182 @@
 static NTSTATUS vboxVdmaCrCtlGetDefaultClientId(PVBOXMP_DEVEXT pDevExt, uint32_t *pu32ClienID)
 {
-    if (pDevExt->enmHwType != VBOXVIDEO_HWTYPE_CROGL)
+    if (pDevExt->enmHwType != VBOXVIDEO_HWTYPE_VBOX)
     {
         /* Should not be called at all in this case. */
@@ -1336 +1336 @@
 NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData)
 {
-    if (pDevExt->enmHwType != VBOXVIDEO_HWTYPE_CROGL)
+    if (pDevExt->enmHwType != VBOXVIDEO_HWTYPE_VBOX)
     {
         /* Not used in this case. */

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

@@ -816 +816 @@
     }
 
-    pDevExt->enmHwType = u32 ? VBOXVIDEO_HWTYPE_VMSVGA : VBOXVIDEO_HWTYPE_CROGL;
-
-    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+    pDevExt->enmHwType = u32 ? VBOXVIDEO_HWTYPE_VMSVGA : VBOXVIDEO_HWTYPE_VBOX;
+
+    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
     {
         pDevExt->f3DEnabled = VBoxMpCrCtlConIs3DSupported();
@@ -824 +824 @@
     else
     {
-        pDevExt->f3DEnabled = f3DSupported;
+        /* No supported 3D hardware, Fallback to VBox 2D only. */
+        pDevExt->enmHwType = VBOXVIDEO_HWTYPE_VBOX;
+        pDevExt->f3DEnabled = FALSE;
     }
 }
@@ -1149 +1151 @@
             {
 #ifdef VBOX_WITH_CROGL
-                if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+                if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                 {
                     if (pDevExt->f3DEnabled)
@@ -1377 +1379 @@
 
 #ifdef VBOX_WITH_CROGL
-    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL && pDevExt->u32CrConDefaultClientID)
+    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX && pDevExt->u32CrConDefaultClientID)
         VBoxMpCrCtlConDisconnect(pDevExt, &pDevExt->CrCtlCon, pDevExt->u32CrConDefaultClientID);
 
@@ -2337 +2339 @@
                     pQAI->u32Version = VBOXVIDEOIF_VERSION;
                     pQAI->enmHwType = pDevExt->enmHwType;
-                    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+                    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                     {
 #ifdef VBOX_WITH_CROGL
-                        pQAI->u.crogl.u32VBox3DCaps = VBoxMpCrGetHostCaps();
+                        pQAI->u.vbox.u32VBox3DCaps = VBoxMpCrGetHostCaps();
 #endif
                     }
@@ -2855 +2857 @@
         /* wait for all current allocation-related ops are completed */
         vboxWddmAllocationCleanup(pDevExt, pAlloc);
-        if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL && pAlloc->hSharedHandle && pAlloc->AllocData.hostID)
+        if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX && pAlloc->hSharedHandle && pAlloc->AllocData.hostID)
             VBoxVdmaChromiumParameteriCRSubmit(pDevExt, GL_PIN_TEXTURE_CLEAR_CR, pAlloc->AllocData.hostID);
         vboxWddmAllocationDestroy(pAlloc);
@@ -4561 +4563 @@
                 if (pEscape->PrivateDriverDataSize == sizeof (*pEscapeHdr))
                 {
-                    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+                    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                         pEscapeHdr->u32CmdSpecific = VBoxMpCrGetHostCaps();
                     else
@@ -6900 +6902 @@
             }
 
-            if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+            if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
             {
 #ifdef VBOX_WITH_CROGL
@@ -6951 +6953 @@
                                         if (pDevExt->f3DEnabled)
                                         {
-                                            if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+                                            if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                                             {
                                                 int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon,
@@ -7006 +7008 @@
                                 if (pDevExt->f3DEnabled)
                                 {
-                                    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+                                    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                                     {
                                         int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon,
@@ -7146 +7148 @@
 
 #ifdef VBOX_WITH_CROGL
-    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL && pContext->u32CrConClientID)
+    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX && pContext->u32CrConClientID)
     {
         VBoxMpCrCtlConDisconnect(pDevExt, &pDevExt->CrCtlCon, pContext->u32CrConClientID);
@@ -7318 +7320 @@
     if (bUpdateRectInited && pSource->bVisible)
     {
-        if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
-            VBOXVBVA_OP_WITHLOCK(ReportDirtyRect, pDevExt, pSource, &UpdateRect);
+        VBOXVBVA_OP_WITHLOCK(ReportDirtyRect, pDevExt, pSource, &UpdateRect);
     }
 
@@ -7659 +7660 @@
 
         /* Check whether 3D is provided by the host. */
-        VBOXVIDEO_HWTYPE enmHwType = VBOXVIDEO_HWTYPE_CROGL;
+        VBOXVIDEO_HWTYPE enmHwType = VBOXVIDEO_HWTYPE_VBOX;
         BOOL f3DSupported = FALSE;
 
@@ -7668 +7669 @@
             if (VBoxVGACfgQuery(VBE_DISPI_CFG_ID_VERSION, &u32, 0))
             {
-                LOGREL(("VGA configuration version %d", u32));
+                LOGREL(("WDDM: VGA configuration version %d", u32));
             }
 
@@ -7679 +7680 @@
                 enmHwType = VBOXVIDEO_HWTYPE_VMSVGA;
             }
+            LOGREL(("WDDM: VGA configuration: 3D %d, hardware type %d", f3DSupported, enmHwType));
         }
 
         BOOL fCmdVbva = FALSE;
-        if (enmHwType == VBOXVIDEO_HWTYPE_CROGL)
+        if (enmHwType == VBOXVIDEO_HWTYPE_VBOX)
         {
             /* Try to establish connection to the host 3D service. */
@@ -7695 +7697 @@
 #endif
         }
-        else if (enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-        {
-            fCmdVbva = TRUE;
-        }
         else
         {
-            Status = STATUS_UNSUCCESSFUL;
+            /* No supported hardware, fallback to VBox 2D only. */
+            enmHwType = VBOXVIDEO_HWTYPE_VBOX;
+            f3DSupported = FALSE;
         }