Changeset 39150 in vbox

Timestamp:

Oct 31, 2011 1:37:06 PM (13 years ago)

Author:

vboxsync

Message:

wddm: avoid unnecessary window creation (caused img flickering for MacOS guest), etc.

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Video/common/VBoxVideoLog.h (modified) (2 diffs)
• Video/disp/wddm/VBoxDispD3D.cpp (modified) (7 diffs)
• Video/disp/wddm/VBoxDispD3D.h (modified) (2 diffs)
• Video/disp/wddm/VBoxDispDbg.h (modified) (2 diffs)
• Video/mp/wddm/VBoxMPWddm.cpp (modified) (2 diffs)
• Wine/wined3d/surface.c (modified) (3 diffs)

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

@@ -67 +67 @@
     } while (0)
 
+#ifdef VBOX_WDDM_MINIPORT
+# define _WARN_LOGGER LogRel
+#else
+# define _WARN_LOGGER Log
+#endif
+
 #define WARN_NOBP(_a)                                                          \
     do                                                                            \
     {                                                                             \
-        Log((VBOX_VIDEO_LOG_PREFIX_FMT"WARNING! ", VBOX_VIDEO_LOG_PREFIX_PARMS)); \
-        Log(_a);                                                                  \
-        Log((VBOX_VIDEO_LOG_SUFFIX_FMT VBOX_VIDEO_LOG_SUFFIX_PARMS));             \
+        _WARN_LOGGER((VBOX_VIDEO_LOG_PREFIX_FMT"WARNING! ", VBOX_VIDEO_LOG_PREFIX_PARMS)); \
+        _WARN_LOGGER(_a);                                                                  \
+        _WARN_LOGGER((VBOX_VIDEO_LOG_SUFFIX_FMT VBOX_VIDEO_LOG_SUFFIX_PARMS));             \
     } while (0)
 
@@ -80 +86 @@
         WARN_NOBP(_a);                                                         \
         BP_WARN();                                                             \
+    } while (0)
+
+#define ASSERT_WARN(_a, _w) do {\
+        if(!(_a)) { \
+            WARN(_w); \
+        }\
     } while (0)
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -3097 +3097 @@
 static HRESULT vboxWddmSwapchainPresent(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_ALLOCATION pBbAlloc)
 {
+    /* we currently *assume* that presenting shared resource is only possible when 3d app is rendering with composited desktop on,
+     * no need to do anything else since dwm will present everything for us */
+    if (pBbAlloc->hSharedHandle)
+    {
+        VBOXVDBG_ASSERT_IS_DWM(FALSE);
+        return S_OK;
+    }
+
     BOOL bNeedPresent;
     PVBOXWDDMDISP_SWAPCHAIN pSwapchain = vboxWddmSwapchainFindCreate(pDevice, pBbAlloc, &bNeedPresent);
@@ -5304 +5312 @@
                 if (SUCCEEDED(hr))
                 {
-                    if (pResource->Pool != D3DDDIPOOL_SYSTEMMEM)
-                    {
-                        vboxWddmMemsetRc(pRc, 0);
-                    }
-                    else
+                    if (pResource->Pool == D3DDDIPOOL_SYSTEMMEM)
                     {
                         vboxWddmSurfSynchMem(pRc);
@@ -5347 +5351 @@
                 if (SUCCEEDED(hr))
                 {
-                    if (pResource->Pool != D3DDDIPOOL_SYSTEMMEM)
-                    {
-                        vboxWddmMemsetRc(pRc, 0);
-                    }
-                    else
+                    if (pResource->Pool == D3DDDIPOOL_SYSTEMMEM)
                     {
                         vboxWddmSurfSynchMem(pRc);
@@ -5392 +5392 @@
                 if (SUCCEEDED(hr))
                 {
-                    if (pResource->Pool != D3DDDIPOOL_SYSTEMMEM)
-                    {
-                        vboxWddmMemsetRc(pRc, 0);
-                    }
-                    else
+                    if (pResource->Pool == D3DDDIPOOL_SYSTEMMEM)
                     {
                         vboxWddmSurfSynchMem(pRc);
@@ -5568 +5564 @@
                 if (SUCCEEDED(hr))
                 {
-                    if (pResource->Pool != D3DDDIPOOL_SYSTEMMEM)
-                    {
-                        vboxWddmMemsetRc(pRc, 0);
-                    }
-                    else
+                    if (pResource->Pool == D3DDDIPOOL_SYSTEMMEM)
                     {
                         vboxWddmSurfSynchMem(pRc);
@@ -5639 +5631 @@
                     if (SUCCEEDED(hr))
                     {
-                        if (pResource->Pool != D3DDDIPOOL_SYSTEMMEM)
-                        {
-                            vboxWddmMemsetRc(pRc, 0);
-                        }
-                        else
+                        if (pResource->Pool == D3DDDIPOOL_SYSTEMMEM)
                         {
                             Assert(0);
@@ -5955 +5943 @@
     Assert(pRc->RcDesc.fFlags.Primary);
     Assert(pAlloc->hAllocation);
-//    PVBOXWDDMDISP_SCREEN pScreen = &pDevice->aScreens[pRc->RcDesc.VidPnSourceId];
-//    Assert(pScreen->hWnd);
-//    Assert(pScreen->pDevice9If);
     D3DDDICB_SETDISPLAYMODE DdiDm = {0};
     DdiDm.hPrimaryAllocation = pAlloc->hAllocation;
-//    DdiDm.PrivateDriverFormatAttribute = 0;
-//    Assert(pScreen->pRenderTargetRc == pRc);
-//    Assert(pScreen->iRenderTargetFrontBuf == pData->SubResourceIndex);
 
     {

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.h

@@ -164 +164 @@
     VBOXWDDMDISP_RENDERTGT aRTs[VBOXWDDMDISP_MAX_SWAPCHAIN_SIZE];
 } VBOXWDDMDISP_SWAPCHAIN, *PVBOXWDDMDISP_SWAPCHAIN;
-
-
-//typedef struct VBOXWDDMDISP_SCREEN
-//{
-//    RTLISTNODE SwapchainList;
-//    IDirect3DDevice9 *pDevice9If;
-////    struct VBOXWDDMDISP_RESOURCE *pDstSharedRc;
-//    uint32_t iRenderTargetFrontBuf;
-//    HWND hWnd;
-//} VBOXWDDMDISP_SCREEN, *PVBOXWDDMDISP_SCREEN;
 
 typedef struct VBOXWDDMDISP_DEVICE
@@ -205 +195 @@
     /* no lock is needed for this since we're guaranteed the per-device calls are not reentrant */
     RTLISTNODE DirtyAllocList;
+
     UINT cRTs;
     struct VBOXWDDMDISP_ALLOCATION * apRTs[1];

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.h

@@ -201 +201 @@
 #define VBOXVDBG_CHECK_EXE(_pszName) (vboxVDbgDoCheckExe(_pszName))
 #define VBOXVDBG_IS_DWM() (!!(g_VBoxVDbgFIsDwm >=0 ? g_VBoxVDbgFIsDwm : (g_VBoxVDbgFIsDwm = VBOXVDBG_CHECK_EXE("dwm.exe"))))
+
+#define VBOXVDBG_ASSERT_IS_DWM(_bDwm) do { \
+        Assert((!VBOXVDBG_IS_DWM()) == (!(_bDwm))); \
+    } while (0)
 
 #define VBOXVDBG_IS_DUMP_ALLOWED(_type) ( \
@@ -503 +507 @@
 #define VBOXVDBG_CHECK_BLT(_opBlt, _pSrcAlloc, _pSrcSurf, _pSrcRect, _pDstAlloc, _pDstSurf, _pDstRect) do { } while (0)
 #define VBOXVDBG_CHECK_TEXBLT(_opTexBlt, _pSrcRc, _pSrcRect, _pDstRc, _pDstPoint) do { } while (0)
+#define VBOXVDBG_ASSERT_IS_DWM(_bDwm) do {} while (0)
 #endif
 

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

@@ -2113 +2113 @@
         else
             Status = STATUS_INVALID_PARAMETER;
-        /* @todo: Implement Resource Data Handling */
-        LOGREL(("WARNING: Implement Resource Data Handling"));
     }
 
@@ -5124 +5122 @@
                     vboxWddmPopulateDmaAllocInfo(&pBlt->Blt.DstAlloc, pDstAlloc, pDst);
 
+                    ASSERT_WARN(!pSrcAlloc->fRcFlags.SharedResource, ("Shared Allocatoin used in Present!"));
+
                     pBlt->Blt.SrcRect = pPresent->SrcRect;
                     pBlt->Blt.DstRects.ContextRect = pPresent->DstRect;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c

@@ -4320 +4320 @@
 #ifdef VBOX_WITH_WDDM
     surface_shrc_lock(This);
-    surface_shrc_lock(Src);
+    if (Src) surface_shrc_lock(Src);
 #endif
 
@@ -4349 +4349 @@
 
 #ifdef VBOX_WITH_WDDM
-    if (IWineD3DSurfaceImpl_BltSys2Vram(This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx, Filter) == WINED3D_OK)
+    if (SrcSurface && IWineD3DSurfaceImpl_BltSys2Vram(This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx, Filter) == WINED3D_OK)
     {
         hr = WINED3D_OK;
@@ -4364 +4364 @@
 #ifdef VBOX_WITH_WDDM
     surface_shrc_unlock(This);
-    surface_shrc_unlock(Src);
+    if (Src) surface_shrc_unlock(Src);
 #endif
     return hr;