Changeset 53799 in vbox

Timestamp:

Jan 14, 2015 12:34:05 PM (10 years ago)

Author:

vboxsync

Message:

Host 3D + WDDM driver: add to host service a check to detect if host reports minimal OpenGL capabilities (currently, only Windows host is considered); notify WDDM driver about that and prevent it from loading once it happened.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
• GuestHost/OpenGL/include/cr_protocol.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_config.c (modified) (3 diffs)

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

@@ -7487 +7487 @@
 #endif
         }
+        else
+        {
+            /* If host reports minimal OpenGL capabilities. */
+            if (VBoxMpCrGetHostCaps() & CR_VBOX_CAP_MINIMAL_HOST_CAPS)
+            {
+                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)

trunk/src/VBox/GuestHost/OpenGL/include/cr_protocol.h

@@ -53 +53 @@
 /* flush command blocks for execution  */
 #define CR_VBOX_CAP_CMDBLOCKS_FLUSH      0x00000010
-
-#define CR_VBOX_CAPS_ALL                 0x0000001f
+/* Notify guest if host reports minimal OpenGL capabilities. */
+#define CR_VBOX_CAP_MINIMAL_HOST_CAPS    0x00000020
+
+#define CR_VBOX_CAPS_ALL                 0x0000003f
 
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c

@@ -58 +58 @@
 }
 
+/* Check if host reports minimal OpenGL capabilities.
+ * For example, on Windows host this may happen if host has no graphics
+ * card drivers installed or drivers were not properly signed or VBox
+ * is running via remote desktop session etc. Currently, we take care
+ * about Windows host only when specific RENDERER and VERSION strings
+ * returned in this case. Later this check should be expanded to the
+ * rest of hosts. */
+static bool crServerHasMinimalCaps()
+{
+    const char *sRealRender;
+    const char *sRealVersion;
+
+    if (!cr_server.head_spu)
+        return true;
+
+    sRealRender  = cr_server.head_spu->dispatch_table.GetString(GL_REAL_RENDERER);
+    sRealVersion = cr_server.head_spu->dispatch_table.GetString(GL_REAL_VERSION);
+
+    if (sRealRender && RTStrCmp(sRealRender, "GDI Generic") == 0)
+        if (sRealVersion && RTStrCmp(sRealVersion, "1.1.0") == 0)
+            return true;
+    return false;
+}
+
 void crServerSetVBoxConfiguration()
 {
@@ -154 +178 @@
     }
 
+    if (crServerHasMinimalCaps())
+    {
+        crDebug("Cfg: report minimal OpenGL capabilities");
+        cr_server.u32Caps |= CR_VBOX_CAP_MINIMAL_HOST_CAPS;
+    }
+
     crInfo("Cfg: u32Caps(%#x), fVisualBitsDefault(%#x)",
             cr_server.u32Caps,
@@ -306 +336 @@
     }
 
+    if (crServerHasMinimalCaps())
+    {
+        crDebug("Cfg: report minimal OpenGL capabilities");
+        cr_server.u32Caps |= CR_VBOX_CAP_MINIMAL_HOST_CAPS;
+    }
+
     crInfo("Cfg: u32Caps(%#x), fVisualBitsDefault(%#x)",
             cr_server.u32Caps,