Changeset 59177 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Dec 17, 2015 4:35:51 PM (9 years ago)

Author:

vboxsync

Message:

WDDM: bugref:8170: do not abort driver loading if the host does not have enough 3D capabilities

Location:

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

Files:

• VBoxMPCr.cpp (modified) (2 diffs)
• VBoxMPWddm.cpp (modified) (1 diff)

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

@@ -1057 +1057 @@
     if (RT_FAILURE(rc))
     {
-        LOGREL(("VBoxMpCrCtlConConnectHgcm failed with rc(%d), 3D not supported!"));
+        LOGREL(("VBoxMpCrCtlConConnectHgcm failed with rc(%d), 3D not supported!", rc));
         return;
     }
-
-    g_VBoxMpCr3DSupported = 1;
 
     rc = vboxMpCrCtlConGetCapsNew(&CrCtlCon, u32ClientID, &g_VBoxMpCrHostCapsInfo);
@@ -1076 +1074 @@
     }
 
+    if (g_VBoxMpCrHostCapsInfo.u32Caps & CR_VBOX_CAP_HOST_CAPS_NOT_SUFFICIENT)
+    {
+        LOGREL(("Insufficient host 3D capabilities"));
+        g_VBoxMpCr3DSupported = 0;
+        memset(&g_VBoxMpCrHostCapsInfo, 0, sizeof (g_VBoxMpCrHostCapsInfo));
+    }
+    else
+    {
+        g_VBoxMpCr3DSupported = 1;
+    }
+
 #if 0 //ndef DEBUG_misha
     g_VBoxMpCrHostCapsInfo.u32Caps &= ~CR_VBOX_CAP_CMDVBVA;

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

@@ -7522 +7522 @@
 #endif
         }
-        else
-        {
-            /* If host reports minimal OpenGL capabilities. */
-            if (VBoxMpCrGetHostCaps() & CR_VBOX_CAP_HOST_CAPS_NOT_SUFFICIENT)
-            {
-                LOGREL(("Host reported minimal OpenGL capabilities. Rolling back."));
-                /* The proper fix would be to switch driver to display-only mode, however, it is currently broken (at least for Win8.1 guests).
-                   'Status = STATUS_UNSUCCESSFUL;' prevents driver from loading and therefore forces Windows to use its default driver => 3D content is shown.
-                   The 'g_VBoxDisplayOnly = 1;' is commented out intentionally; please uncomment when display-only mode will be
-                   fixed and remove 'Status = STATUS_UNSUCCESSFUL;' one. */
-                Status = STATUS_UNSUCCESSFUL;
-#ifdef VBOX_WDDM_WIN8
-                //g_VBoxDisplayOnly = 1;
-#endif
-            }
-        }
 
 #if 0 //defined(DEBUG_misha) && defined(VBOX_WDDM_WIN8)