Changeset 34884 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2010 1:24:02 PM (14 years ago)

Author:

vboxsync

Message:

Ogl: make HGSMI be properly disabled for non-WDDM

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Display/wddm/VBoxCrHgsmi.cpp (modified) (2 diffs)
• Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp (modified) (2 diffs)
• GuestHost/OpenGL/util/vboxhgcm.c (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxCrHgsmi.cpp

@@ -138 +138 @@
 }
 #else
+static int vboxCrHgsmiInitPerform(VBOXDISPKMT_CALLBACKS *pCallbacks)
+{
+    HRESULT hr = vboxDispKmtCallbacksInit(pCallbacks);
+    Assert(hr == S_OK);
+    if (hr == S_OK)
+    {
+        /* check if we can create the hgsmi */
+        PVBOXUHGSMI pHgsmi = VBoxCrHgsmiCreate();
+        if (pHgsmi)
+        {
+            /* yes, we can, so this is wddm mode */
+            VBoxCrHgsmiDestroy(pHgsmi);
+            Log(("CrHgsmi: WDDM mode supported\n"));
+            return 1;
+        }
+        vboxDispKmtCallbacksTerm(pCallbacks);
+    }
+    Log(("CrHgsmi: unsupported\n"));
+    return -1;
+}
+
 VBOXCRHGSMI_DECL(int) VBoxCrHgsmiInit()
 {
     if (!g_bVBoxKmtCallbacksInited)
     {
-        HRESULT hr = vboxDispKmtCallbacksInit(&g_VBoxCrHgsmiKmtCallbacks);
-        Assert(hr == S_OK);
-        if (hr == S_OK)
-            g_bVBoxKmtCallbacksInited = 1;
-        else
-            g_bVBoxKmtCallbacksInited = -1;
-    }
-
-    Assert(g_bVBoxKmtCallbacksInited);
-    if (g_bVBoxKmtCallbacksInited < 0)
-    {
-        Assert(0);
-        return VERR_NOT_SUPPORTED;
-    }
-
-    return VINF_SUCCESS;
+        g_bVBoxKmtCallbacksInited = vboxCrHgsmiInitPerform(&g_VBoxCrHgsmiKmtCallbacks);
+        Assert(g_bVBoxKmtCallbacksInited);
+    }
+
+    return g_bVBoxKmtCallbacksInited > 0 ? VINF_SUCCESS : VERR_NOT_SUPPORTED;
 }
 
@@ -170 +180 @@
         HRESULT hr = vboxUhgsmiKmtEscCreate(pHgsmiGL, TRUE /* bD3D tmp for injection thread*/);
 #endif
-        Assert(hr == S_OK);
+        Log(("CrHgsmi: faled to create KmtEsc UHGSMI instance, hr (0x%x)\n", hr));
         if (hr == S_OK)
         {

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp

@@ -412 +412 @@
     {
         hr = vboxDispKmtOpenAdapter(&pHgsmi->Callbacks, &pHgsmi->Adapter);
+#ifdef DEBUG_misha
+        /* may fail with xpdm driver */
         Assert(hr == S_OK);
+#endif
         if (hr == S_OK)
         {
@@ -625 +628 @@
     {
         NTSTATUS Status = pCallbacks->pfnD3DKMTOpenAdapterFromHdc(&OpenAdapterData);
+#ifdef DEBUG_misha
+        /* may fail with xpdm driver */
         Assert(!Status);
+#endif
         if (!Status)
         {

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -1612 +1612 @@
         rc = VBoxCrHgsmiInit(&Callbacks);
 #endif
-        AssertRC(rc);
         if (RT_SUCCESS(rc))
             bHasHGSMI = 1;
         else
             bHasHGSMI = 0;
-    }
-
-    Assert(bHasHGSMI);
+
+        crDebug("CrHgsmi is %s", bHasHGSMI ? "ENABLED" : "DISABLED");
+    }
+
+    Assert(bHasHGSMI >= 0);
 
     return bHasHGSMI;