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

Timestamp:

Jul 10, 2013 11:39:19 AM (12 years ago)

Author:

vboxsync

Message:

wddm: fix 3D disabled case

Location:

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

Files:

• common/VBoxVideoLog.h (modified) (2 diffs)
• mp/common/VBoxMPDevExt.h (modified) (1 diff)
• mp/wddm/VBoxMPCr.cpp (modified) (4 diffs)
• mp/wddm/VBoxMPCr.h (modified) (1 diff)
• mp/wddm/VBoxMPVdma.cpp (modified) (1 diff)
• mp/wddm/VBoxMPWddm.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/VBoxVideoLog.h

@@ -104 +104 @@
         BP_WARN();         \
     } while (0)
+
 #define ASSERT_WARN(_a, _w) do {\
         if(!(_a)) { \
@@ -117 +118 @@
         STOP_FATAL();                             \
     } while (0)
+
+#define _DBGOP_N_TIMES(_count, _op) do {    \
+        static int fDoWarnCount = (_count); \
+        if (fDoWarnCount) { \
+            --fDoWarnCount; \
+            _op; \
+        } \
+    } while (0)
+
+#define WARN_ONCE(_a) do {    \
+        _DBGOP_N_TIMES(1, WARN(_a)); \
+    } while (0)
+
 
 #define LOG(_a) _LOGMSG(VBOX_VIDEO_LOG_LOGGER, "", _a)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

@@ -115 +115 @@
    volatile BOOLEAN fRenderToShadowDisabled;
 
+   BOOLEAN f3DEnabled;
    BOOLEAN fTexPresentEnabled;
 

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

@@ -26 +26 @@
 
 static uint32_t g_VBoxMpCrHostCaps = 0;
+static uint32_t g_VBoxMpCr3DSupported = 0;
 
 uint32_t VBoxMpCrGetHostCaps()
 {
     return g_VBoxMpCrHostCaps;
+}
+
+bool VBoxMpCrCtlConIs3DSupported()
+{
+    return !!g_VBoxMpCr3DSupported;
 }
 
@@ -863 +869 @@
 }
 
-bool VBoxMpCrCtlConIs3DSupported()
-{
+void VBoxMpCrCtlConInit()
+{
+    g_VBoxMpCr3DSupported = 0;
+    g_VBoxMpCrHostCaps = 0;
+
 #ifdef VBOX_WITH_CROGL
     VBOXMP_CRCTLCON CrCtlCon = {0};
@@ -872 +881 @@
     {
         LOGREL(("VBoxMpCrCtlConConnect failed with rc(%d), 3D not supported!"));
-        return false;
-    }
+        return;
+    }
+
+    g_VBoxMpCr3DSupported = 1;
 
     rc = vboxMpCrCtlConGetCaps(&CrCtlCon, u32ClientID, &g_VBoxMpCrHostCaps);
@@ -890 +901 @@
     if (RT_FAILURE(rc))
         WARN(("VBoxMpCrCtlConDisconnect failed rc (%d), ignoring..", rc));
-
-    return true;
 #else
-    return false;
 #endif
 }

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

@@ -28 +28 @@
 } VBOXMP_CRCTLCON, *PVBOXMP_CRCTLCON;
 
+void VBoxMpCrCtlConInit();
+
 bool VBoxMpCrCtlConIs3DSupported();
 

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

@@ -971 +971 @@
     if (!pDevExt->u32CrConDefaultClientID)
     {
+        if (!pDevExt->f3DEnabled)
+        {
+            WARN(("3D disabled, should not be here!"));
+            return STATUS_UNSUCCESSFUL;
+        }
+
         int rc = VBoxMpCrCtlConConnect(&pDevExt->CrCtlCon, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR, &pDevExt->u32CrConDefaultClientID);
         if (!RT_SUCCESS(rc))

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

@@ -281 +281 @@
             if (NT_SUCCESS(Status))
             {
-                Status = vboxVdmaTexPresentSetAlloc(pDevExt, pAllocData);
-                if (NT_SUCCESS(Status))
-                    return STATUS_SUCCESS;
-                else
-                    WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
+                if (pDevExt->f3DEnabled)
+                {
+                    Status = vboxVdmaTexPresentSetAlloc(pDevExt, pAllocData);
+                    if (NT_SUCCESS(Status))
+                        return STATUS_SUCCESS;
+                    else
+                        WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
+                }
             }
             else
@@ -1172 +1175 @@
                     VBoxMpCrShgsmiTransportCreate(&pDevExt->CrHgsmiTransport, pDevExt);
 
-                    pDevExt->fTexPresentEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_TEX_PRESENT);
-                    Assert(!pDevExt->fTexPresentEnabled);
+                    pDevExt->f3DEnabled = VBoxMpCrCtlConIs3DSupported();
+
+                    if (pDevExt->f3DEnabled)
+                    {
+                        pDevExt->fTexPresentEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_TEX_PRESENT);
+                        Assert(!pDevExt->fTexPresentEnabled);
+                    }
+                    else
+                        pDevExt->fTexPresentEnabled = FALSE;
 
                     for (UINT i = 0; i < (UINT)VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
@@ -5971 +5981 @@
             }
 
-            int rc = VBoxMpCrCtlConConnect(&pDevExt->CrCtlCon, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR, &pContext->u32CrConClientID);
-            if (RT_SUCCESS(rc))
+            if (!VBOXWDDM_IS_DISPLAYONLY() && pDevExt->f3DEnabled)
             {
                 VBoxMpCrPackerInit(&pContext->CrPacker);
-            }
-            else
-            {
-                WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
-                Status = STATUS_UNSUCCESSFUL;
-            }
+                int rc = VBoxMpCrCtlConConnect(&pDevExt->CrCtlCon, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR, &pContext->u32CrConClientID);
+                if (!RT_SUCCESS(rc))
+                    WARN(("VBoxMpCrCtlConConnect failed rc (%d), ignoring for system context", rc));
+            }
+
+            Status = STATUS_SUCCESS;
         }
         else
@@ -6009 +6018 @@
                                     if (pInfo->crVersionMajor || pInfo->crVersionMinor)
                                     {
-                                        int rc = VBoxMpCrCtlConConnect(&pDevExt->CrCtlCon,
-                                            pInfo->crVersionMajor, pInfo->crVersionMinor,
-                                            &pContext->u32CrConClientID);
-                                        if (RT_SUCCESS(rc))
+                                        if (pDevExt->f3DEnabled)
                                         {
-                                            VBoxMpCrPackerInit(&pContext->CrPacker);
+                                            int rc = VBoxMpCrCtlConConnect(&pDevExt->CrCtlCon,
+                                                pInfo->crVersionMajor, pInfo->crVersionMinor,
+                                                &pContext->u32CrConClientID);
+                                            if (RT_SUCCESS(rc))
+                                            {
+                                                VBoxMpCrPackerInit(&pContext->CrPacker);
+                                            }
+                                            else
+                                            {
+                                                WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
+                                                Status = STATUS_UNSUCCESSFUL;
+                                            }
                                         }
                                         else
                                         {
-                                            WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
+                                            LOG(("3D Not Enabled, failing 3D context creation"));
                                             Status = STATUS_UNSUCCESSFUL;
                                         }
@@ -6046 +6063 @@
                             if (pInfo->crVersionMajor || pInfo->crVersionMinor)
                             {
-                                int rc = VBoxMpCrCtlConConnect(&pDevExt->CrCtlCon,
-                                    pInfo->crVersionMajor, pInfo->crVersionMinor,
-                                    &pContext->u32CrConClientID);
-                                if (!RT_SUCCESS(rc))
+                                if (pDevExt->f3DEnabled)
                                 {
-                                    WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
+                                    int rc = VBoxMpCrCtlConConnect(&pDevExt->CrCtlCon,
+                                        pInfo->crVersionMajor, pInfo->crVersionMinor,
+                                        &pContext->u32CrConClientID);
+                                    if (!RT_SUCCESS(rc))
+                                    {
+                                        WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
+                                        Status = STATUS_UNSUCCESSFUL;
+                                    }
+                                }
+                                else
+                                {
+                                    LOG(("3D Not Enabled, failing 3D (hgsmi) context creation"));
                                     Status = STATUS_UNSUCCESSFUL;
                                 }
@@ -6619 +6644 @@
         Status = STATUS_SUCCESS;
 
+        VBoxMpCrCtlConInit();
+
         /* always need to do the check to request host caps */
         LOG(("Doing the 3D check.."));