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

Timestamp:

Oct 21, 2010 12:52:37 PM (14 years ago)

Author:

vboxsync

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

66877

Message:

wddm/3d: scrolling with aero 8x speedup, bugfixing + profiling

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Files:

• VBoxCrHgsmi.cpp (modified) (4 diffs)
• VBoxDispD3D.cpp (modified) (4 diffs)
• VBoxDispD3D.h (modified) (1 diff)

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

@@ -8 +8 @@
 static uint32_t g_cVBoxCrHgsmiProvider = 0;
 
+static VBOXDISPKMT_CALLBACKS g_VBoxCrHgsmiKmtCallbacks;
+
 typedef VBOXWDDMDISP_DECL(int) FNVBOXDISPCRHGSMI_INIT(PVBOXCRHGSMI_CALLBACKS pCallbacks);
 typedef FNVBOXDISPCRHGSMI_INIT *PFNVBOXDISPCRHGSMI_INIT;
@@ -23 +25 @@
 VBOXCRHGSMI_DECL(int) VBoxCrHgsmiInit(PVBOXCRHGSMI_CALLBACKS pCallbacks)
 {
+    static int bKmtCallbacksInited = 0;
+    if (!bKmtCallbacksInited)
+    {
+        HRESULT hr = vboxDispKmtCallbacksInit(&g_VBoxCrHgsmiKmtCallbacks);
+        Assert(hr == S_OK);
+        if (hr == S_OK)
+            bKmtCallbacksInited = 1;
+        else
+            bKmtCallbacksInited = -1;
+    }
+
+    Assert(bKmtCallbacksInited);
+    if (bKmtCallbacksInited < 0)
+    {
+        Assert(0);
+        return VERR_NOT_SUPPORTED;
+    }
+
     g_VBoxCrHgsmiCallbacks = *pCallbacks;
     if (!g_hVBoxCrHgsmiProvider)
@@ -77 +97 @@
     {
         hClient = g_pfnVBoxDispCrHgsmiQueryClient();
-#ifdef DEBUG_misha
-        Assert(hClient);
-#endif
+//#ifdef DEBUG_misha
+//        Assert(hClient);
+//#endif
         if (hClient)
             return hClient;
@@ -125 +145 @@
 }
 
+VBOXCRHGSMI_DECL(void) VBoxCrHgsmiLog(char * szString)
+{
+    VBOXDISPKMT_ADAPTER Adapter;
+    HRESULT hr = vboxDispKmtOpenAdapter(&g_VBoxCrHgsmiKmtCallbacks, &Adapter);
+    Assert(hr == S_OK);
+    if (hr == S_OK)
+    {
+        uint32_t cbString = (uint32_t)strlen(szString) + 1;
+        uint32_t cbCmd = RT_OFFSETOF(VBOXDISPIFESCAPE_DBGPRINT, aStringBuf[cbString]);
+        PVBOXDISPIFESCAPE_DBGPRINT pCmd = (PVBOXDISPIFESCAPE_DBGPRINT)RTMemAllocZ(cbCmd);
+        Assert(pCmd);
+        if (pCmd)
+        {
+            pCmd->EscapeHdr.escapeCode = VBOXESC_DBGPRINT;
+            memcpy(pCmd->aStringBuf, szString, cbString);
+
+            D3DKMT_ESCAPE EscapeData = {0};
+            EscapeData.hAdapter = Adapter.hAdapter;
+            //EscapeData.hDevice = NULL;
+            EscapeData.Type = D3DKMT_ESCAPE_DRIVERPRIVATE;
+    //        EscapeData.Flags.HardwareAccess = 1;
+            EscapeData.pPrivateDriverData = pCmd;
+            EscapeData.PrivateDriverDataSize = cbCmd;
+            //EscapeData.hContext = NULL;
+
+            int Status = g_VBoxCrHgsmiKmtCallbacks.pfnD3DKMTEscape(&EscapeData);
+            Assert(!Status);
+
+            RTMemFree(pCmd);
+        }
+        hr = vboxDispKmtCloseAdapter(&Adapter);
+        Assert(hr == S_OK);
+    }
+}
 
 ///* to be used by injection thread and by ogl ICD driver for hgsmi initialization*/

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

@@ -1699 +1699 @@
         pSwapchain->pRenderTargetFbCopy->Release();
         pSwapchain->pRenderTargetFbCopy = NULL;
+        pSwapchain->bRTFbCopyUpToDate = FALSE;
 #endif
         pSwapchain->pSwapChainIf->Release();
@@ -2358 +2359 @@
         pSwapchain->pSwapChainIf = pNewIf;
 #ifndef VBOXWDDM_WITH_VISIBLE_FB
+        pSwapchain->bRTFbCopyUpToDate = FALSE;
         if (!pSwapchain->pRenderTargetFbCopy)
         {
@@ -2462 +2464 @@
     if (hr == S_OK)
     {
+        pSwapchain->bRTFbCopyUpToDate = FALSE;
         vboxWddmSwapchainFlip(pSwapchain);
         Assert(pSwapchain->fFlags.Value == 0);
@@ -6355 +6358 @@
                     pSrcSurfIf = pSrcSwapchain->pRenderTargetFbCopy;
                     Assert(pSrcSurfIf);
-                    hr = pSrcSwapchain->pSwapChainIf->GetFrontBufferData(pSrcSurfIf);
-                    Assert(hr == S_OK);
-                    if (hr == S_OK)
+                    if (!pSrcSwapchain->bRTFbCopyUpToDate)
                     {
-                        /* do pSrcSurfIf->AddRef since we do a Release in the following if (hr == S_OK) branch */
+                        hr = pSrcSwapchain->pSwapChainIf->GetFrontBufferData(pSrcSurfIf);
+                        Assert(hr == S_OK);
+                        if (hr == S_OK)
+                        {
+                            /* do pSrcSurfIf->AddRef since we do a Release in the following if (hr == S_OK) branch */
+                            pSrcSwapchain->bRTFbCopyUpToDate = TRUE;
+                            pSrcSurfIf->AddRef();
+                        }
+                    }
+                    else
+                    {
                         pSrcSurfIf->AddRef();
                     }

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

@@ -139 +139 @@
 #ifndef VBOXWDDM_WITH_VISIBLE_FB
     IDirect3DSurface9 *pRenderTargetFbCopy;
+    BOOL bRTFbCopyUpToDate;
 #endif
     IDirect3DSwapChain9 *pSwapChainIf;