Changeset 30317 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp

Timestamp:

Jun 18, 2010 9:51:03 PM (15 years ago)

Author:

vboxsync

Message:

wddm/2d: bugfixing + more impl

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp (modified) (16 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp

@@ -201 +201 @@
 }
 
-void vboxVHWAFreeHostInfo1(PDEVICE_EXTENSION pDevExt, VBOXVHWACMD_QUERYINFO1* pInfo)
+void vboxVhwaFreeHostInfo1(PDEVICE_EXTENSION pDevExt, VBOXVHWACMD_QUERYINFO1* pInfo)
 {
     VBOXVHWACMD* pCmd = VBOXVHWACMD_HEAD(pInfo);
@@ -207 +207 @@
 }
 
-void vboxVHWAFreeHostInfo2(PDEVICE_EXTENSION pDevExt, VBOXVHWACMD_QUERYINFO2* pInfo)
+void vboxVhwaFreeHostInfo2(PDEVICE_EXTENSION pDevExt, VBOXVHWACMD_QUERYINFO2* pInfo)
 {
     VBOXVHWACMD* pCmd = VBOXVHWACMD_HEAD(pInfo);
@@ -213 +213 @@
 }
 
-VBOXVHWACMD_QUERYINFO1* vboxVHWAQueryHostInfo1(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
+VBOXVHWACMD_QUERYINFO1* vboxVhwaQueryHostInfo1(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
 {
     VBOXVHWACMD* pCmd = vboxVhwaCommandCreate(pDevExt, srcId, VBOXVHWACMD_TYPE_QUERY_INFO1, sizeof(VBOXVHWACMD_QUERYINFO1));
@@ -221 +221 @@
     if (!pCmd)
     {
-        drprintf((0, "VBoxDISP::vboxVHWAQueryHostInfo1: vboxVHWACommandCreate failed\n"));
+        drprintf((0, "VBoxDISP::vboxVhwaQueryHostInfo1: vboxVhwaCommandCreate failed\n"));
         return NULL;
     }
@@ -245 +245 @@
 }
 
-VBOXVHWACMD_QUERYINFO2* vboxVHWAQueryHostInfo2(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId, uint32_t numFourCC)
+VBOXVHWACMD_QUERYINFO2* vboxVhwaQueryHostInfo2(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId, uint32_t numFourCC)
 {
     VBOXVHWACMD* pCmd = vboxVhwaCommandCreate(pDevExt, srcId, VBOXVHWACMD_TYPE_QUERY_INFO2, VBOXVHWAINFO2_SIZE(numFourCC));
@@ -252 +252 @@
     if (!pCmd)
     {
-        drprintf((0, "VBoxDISP::vboxVHWAQueryHostInfo2: vboxVHWACommandCreate failed\n"));
+        drprintf((0, "VBoxDISP::vboxVhwaQueryHostInfo2: vboxVhwaCommandCreate failed\n"));
         return NULL;
     }
@@ -277 +277 @@
 }
 
-int vboxVHWAEnable(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
+int vboxVhwaEnable(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
 {
     int rc = VERR_GENERAL_FAILURE;
@@ -286 +286 @@
     if (!pCmd)
     {
-        drprintf((0, "VBoxDISP::vboxVHWAEnable: vboxVHWACommandCreate failed\n"));
+        drprintf((0, "VBoxDISP::vboxVhwaEnable: vboxVhwaCommandCreate failed\n"));
         return rc;
     }
@@ -305 +305 @@
 }
 
-int vboxVHWADisable(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
+int vboxVhwaDisable(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
 {
     int rc = VERR_GENERAL_FAILURE;
@@ -314 +314 @@
     if (!pCmd)
     {
-        drprintf((0, "VBoxDISP::vboxVHWADisable: vboxVHWACommandCreate failed\n"));
+        drprintf((0, "VBoxDISP::vboxVhwaDisable: vboxVhwaCommandCreate failed\n"));
         return rc;
     }
@@ -333 +333 @@
 }
 
-static void vboxVHWAInitSrc(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
+static void vboxVhwaInitSrc(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
 {
     Assert(srcId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)pDevExt->u.primary.cDisplays);
@@ -339 +339 @@
     memset (pSettings, 0, sizeof (VBOXVHWA_INFO));
 
-    VBOXVHWACMD_QUERYINFO1* pInfo1 = vboxVHWAQueryHostInfo1(pDevExt, srcId);
+    VBOXVHWACMD_QUERYINFO1* pInfo1 = vboxVhwaQueryHostInfo1(pDevExt, srcId);
     if (pInfo1)
     {
@@ -379 +379 @@
                         && (pInfo1->u.out.caps & VBOXVHWA_CAPS_OVERLAYFOURCC))
                 {
-                    VBOXVHWACMD_QUERYINFO2* pInfo2 = vboxVHWAQueryHostInfo2(pDevExt, srcId, pInfo1->u.out.numFourCC);
+                    VBOXVHWACMD_QUERYINFO2* pInfo2 = vboxVhwaQueryHostInfo2(pDevExt, srcId, pInfo1->u.out.numFourCC);
                     if (pInfo2)
                     {
@@ -387 +387 @@
                             ++pSettings->cFormats;
                         }
-                        vboxVHWAFreeHostInfo2(pDevExt, pInfo2);
+                        vboxVhwaFreeHostInfo2(pDevExt, pInfo2);
                     }
                 }
             }
         }
-        vboxVHWAFreeHostInfo1(pDevExt, pInfo1);
-    }
-}
-
-void vboxVHWAInit(PDEVICE_EXTENSION pDevExt)
+        vboxVhwaFreeHostInfo1(pDevExt, pInfo1);
+    }
+}
+
+void vboxVhwaInit(PDEVICE_EXTENSION pDevExt)
 {
     for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
     {
-        vboxVHWAInitSrc(pDevExt, (D3DDDI_VIDEO_PRESENT_SOURCE_ID)i);
-    }
-}
-
-void vboxVHWAFree(PDEVICE_EXTENSION pDevExt)
+        vboxVhwaInitSrc(pDevExt, (D3DDDI_VIDEO_PRESENT_SOURCE_ID)i);
+    }
+}
+
+void vboxVhwaFree(PDEVICE_EXTENSION pDevExt)
 {
     /* we do not allocate/map anything, just issue a Disable command
@@ -410 +410 @@
     for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
     {
-        vboxVHWADisable(pDevExt, i);
+        vboxVhwaDisable(pDevExt, i);
     }
 }
@@ -715 +715 @@
     if (cNew == 1)
     {
-        rc = vboxVhwaHlpCreatePrimary(pDevExt, pSource, VidPnSourceId);
+        rc = vboxVhwaEnable(pDevExt, VidPnSourceId);
         AssertRC(rc);
+        if (RT_SUCCESS(rc))
+        {
+            rc = vboxVhwaHlpCreatePrimary(pDevExt, pSource, VidPnSourceId);
+            AssertRC(rc);
+            if (RT_FAILURE(rc))
+            {
+                int tmpRc = vboxVhwaDisable(pDevExt, VidPnSourceId);
+                AssertRC(tmpRc);
+            }
+        }
     }
     else