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

Timestamp:

Aug 23, 2010 3:22:09 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine: flush implementation basics

Location:

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

Files:

• VBoxDispD3D.cpp (modified) (1 diff)
• VBoxDispD3DIf.cpp (modified) (1 diff)
• VBoxDispD3DIf.h (modified) (1 diff)

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

@@ -4154 +4154 @@
     {
         Assert(pDevice->cScreens);
-        for (UINT i = 0; i < RT_ELEMENTS(pDevice->aScreens); ++i)
+        UINT cProcessed = 0;
+        for (UINT i = 0; cProcessed < pDevice->cScreens && i < RT_ELEMENTS(pDevice->aScreens); ++i)
         {
             PVBOXWDDMDISP_SCREEN pScreen = &pDevice->aScreens[i];
             if (pScreen->pDevice9If)
             {
-                /* @todo: make a flush */
+                ++cProcessed;
+                if (pScreen->pRenderTargetRc->cAllocations == 1)
+                {
+                    hr = pScreen->pDevice9If->Present(NULL, NULL, NULL, NULL);
+                    Assert(hr == S_OK);
+                }
+                else
+                {
+                    hr = pDevice->pAdapter->D3D.pfnVBoxWineExD3DDev9Flush((IDirect3DDevice9Ex*)pScreen->pDevice9If);
+                    Assert(hr == S_OK);
+                }
             }
         }

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

@@ -39 +39 @@
             if (pD3D->pfnVBoxWineExD3DDev9CreateTexture)
             {
-                return S_OK;
+                pD3D->pfnVBoxWineExD3DDev9Flush = (PFNVBOXWINEEXD3DDEV9_FLUSH)GetProcAddress(pD3D->hD3DLib, "VBoxWineExD3DDev9Flush");
+                Assert(pD3D->pfnVBoxWineExD3DDev9Flush);
+                if (pD3D->pfnVBoxWineExD3DDev9Flush)
+                {
+                    return S_OK;
+                }
             }
         }

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

@@ -35 +35 @@
     PFNVBOXWINEEXD3DDEV9_CREATETEXTURE pfnVBoxWineExD3DDev9CreateTexture;
 
+    PFNVBOXWINEEXD3DDEV9_FLUSH pfnVBoxWineExD3DDev9Flush;
+
     /* module handle */
     HMODULE hD3DLib;