Changeset 29488 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Timestamp:

May 14, 2010 5:05:43 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

61618

Message:

wddm: getcaps for d3d9, start impl 2D support

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp (modified) (3 diffs)

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

@@ -30 +30 @@
 #include "VBoxDispD3D.h"
 #include "VBoxDispD3DCmn.h"
+#include "../../Miniport/wddm/VBoxVideoIf.h"
 
 #ifdef VBOXWDDMDISP_DEBUG
@@ -73 +74 @@
 
     HRESULT hr = S_OK;
+    PVBOXWDDMDISP_ADAPTER pAdapter = (PVBOXWDDMDISP_ADAPTER)hAdapter;
 
     switch (pData->Type)
     {
         case D3DDDICAPS_DDRAW:
+        {
+            AssertBreakpoint();
             Assert(pData->DataSize >= sizeof (DDRAW_CAPS));
             if (pData->DataSize >= sizeof (DDRAW_CAPS))
+            {
                 memset(pData->pData, 0, sizeof (DDRAW_CAPS));
+#ifdef VBOX_WITH_VIDEOHWACCEL
+                VBOXWDDM_QI_2D_1 Query;
+                Query.hdr.enmType = VBOXWDDM_QI_TYPE_2D_1;
+                VBOXVHWA_VERSION_INIT(&Query.Info.u.in.guestVersion);
+                D3DDDICB_QUERYADAPTERINFO DdiQuery;
+                DdiQuery.PrivateDriverDataSize = sizeof(Query);
+                DdiQuery.pPrivateDriverData = &Query;
+                hr = pAdapter->RtCallbacks.pfnQueryAdapterInfoCb(pAdapter->hAdapter, &DdiQuery);
+                Assert(hr == S_OK);
+                if (hr == S_OK)
+                {
+                    if (Query.hdr.rc == VINF_SUCCESS)
+                    {
+                        /* query succeeded, check the results */
+                        if (Query.Info.u.out.cfgFlags == VBOXVHWA_CFG_ENABLED)
+                        {
+                            /* 2D is enabled*/
+                            DDRAW_CAPS *pCaps = (DDRAW_CAPS*)pData->pData;
+                            /* overlay supported */
+                            if (Query.Info.u.out.surfaceCaps & VBOXVHWA_SCAPS_OVERLAY)
+                            {
+                                if (Query.Info.u.out.caps & VBOXVHWA_CAPS_COLORKEY)
+                                {
+                                    pCaps->Caps = DDRAW_CAPS_COLORKEY;
+                                }
+                            }
+
+                            /* @todo: feel the caps from here */
+                        }
+                    }
+                }
+#endif
+            }
             else
                 hr = E_INVALIDARG;
             break;
+        }
         case D3DDDICAPS_DDRAW_MODE_SPECIFIC:
+        {
+            AssertBreakpoint();
             Assert(pData->DataSize >= sizeof (DDRAW_MODE_SPECIFIC_CAPS));
             if (pData->DataSize >= sizeof (DDRAW_MODE_SPECIFIC_CAPS))
-                memset(pData->pData, 0, sizeof (DDRAW_MODE_SPECIFIC_CAPS));
+            {
+                DDRAW_MODE_SPECIFIC_CAPS * pCaps = (DDRAW_MODE_SPECIFIC_CAPS*)pData->pData;
+                memset(&pCaps->Caps /* do not cleanup the first "Head" field,
+                                    zero starting with the one following "Head", i.e. Caps */,
+                        0, sizeof (DDRAW_MODE_SPECIFIC_CAPS) - RT_OFFSETOF(DDRAW_MODE_SPECIFIC_CAPS, Caps));
+#ifdef VBOX_WITH_VIDEOHWACCEL
+                VBOXWDDM_QI_2D_1 Query;
+                Query.hdr.enmType = VBOXWDDM_QI_TYPE_2D_1;
+                VBOXVHWA_VERSION_INIT(&Query.Info.u.in.guestVersion);
+                D3DDDICB_QUERYADAPTERINFO DdiQuery;
+                DdiQuery.PrivateDriverDataSize = sizeof(Query);
+                DdiQuery.pPrivateDriverData = &Query;
+                hr = pAdapter->RtCallbacks.pfnQueryAdapterInfoCb(pAdapter->hAdapter, &DdiQuery);
+                Assert(hr == S_OK);
+                if (hr == S_OK)
+                {
+                    if (Query.hdr.rc == VINF_SUCCESS)
+                    {
+                        /* query succeeded, check the results */
+                        if (Query.Info.u.out.cfgFlags == VBOXVHWA_CFG_ENABLED)
+                        {
+                            /* 2D is enabled*/
+                            if (Query.Info.u.out.surfaceCaps & VBOXVHWA_SCAPS_OVERLAY)
+                            {
+                                /* overlay supported */
+                                pCaps->Caps = MODE_CAPS_OVERLAY | MODE_CAPS_OVERLAYSTRETCH;
+                                if (Query.Info.u.out.caps & VBOXVHWA_CAPS_COLORKEY)
+                                {
+                                    if (Query.Info.u.out.colorKeyCaps & VBOXVHWA_CKEYCAPS_DESTOVERLAY)
+                                    {
+                                        pCaps->CKeyCaps |= MODE_CKEYCAPS_DESTOVERLAY
+                                                | MODE_CKEYCAPS_DESTOVERLAYYUV /* ?? */;
+                                    }
+                                }
+
+                                pCaps->FxCaps = MODE_FXCAPS_OVERLAYSHRINKX
+                                        | MODE_FXCAPS_OVERLAYSHRINKY
+                                        | MODE_FXCAPS_OVERLAYSTRETCHX
+                                        | MODE_FXCAPS_OVERLAYSTRETCHY;
+
+                                pCaps->MaxVisibleOverlays = Query.Info.u.out.numOverlays;
+                                pCaps->MinOverlayStretch = 1;
+                                pCaps->MaxOverlayStretch = 32000;
+                            }
+                        }
+                    }
+                }
+#endif
+            }
             else
                 hr = E_INVALIDARG;
             break;
+        }
         case D3DDDICAPS_GETFORMATCOUNT:
             *((uint32_t*)pData->pData) = 0;
@@ -114 +204 @@
             break;
         case D3DDDICAPS_GETD3D9CAPS:
+        {
             Assert(pData->DataSize >= sizeof (D3DCAPS9));
             if (pData->DataSize >= sizeof (D3DCAPS9))
+            {
+                if (pAdapter->pD3D9If)
+                {
+                    hr = pAdapter->pD3D9If->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, (D3DCAPS9*)pData->pData);
+                    Assert(hr == S_OK);
+                    if (hr == S_OK)
+                        break;
+
+                    vboxVDbgPrintR((__FUNCTION__": GetDeviceCaps hr(%d)\n", hr));
+                    /* let's fall back to the 3D disabled case */
+                    hr = S_OK;
+                }
+
                 memset(pData->pData, 0, sizeof (D3DCAPS9));
+            }
             else
                 hr = E_INVALIDARG;
             break;
+        }
         case D3DDDICAPS_GETGAMMARAMPCAPS:
             *((uint32_t*)pData->pData) = 0;