Changeset 81431 in vbox

Timestamp:

Oct 21, 2019 7:54:52 PM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics: correct fix for flickering with D3D backend

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-internal.h (modified) (2 diffs)
• DevVGA-SVGA3d-win.cpp (modified) (13 diffs)
• DevVGA-SVGA3d.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -587 +587 @@
     /** Event query inserted after each GPU operation that updates or uses this surface. */
     IDirect3DQuery9        *pQuery;
-    /* The type of actually created D3D resource. */
+    /** The context id where the query has been created. */
+    uint32_t                idQueryContext;
+    /** The type of actually created D3D resource. */
     VMSVGA3DD3DRESTYPE      enmD3DResType;
     union
@@ -1116 +1118 @@
 D3DMULTISAMPLE_TYPE vmsvga3dMultipeSampleCount2D3D(uint32_t multisampleCount);
 DECLCALLBACK(int) vmsvga3dSharedSurfaceDestroyTree(PAVLU32NODECORE pNode, void *pvParam);
-int vmsvga3dSurfaceFlush(PVGASTATE pThis, PVMSVGA3DSURFACE pSurface);
+int vmsvga3dSurfaceFlush(PVMSVGA3DSURFACE pSurface);
 #endif /* VMSVGA3D_DIRECT3D */
 

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -1317 +1317 @@
     LogFunc(("track usage of sid=%x (cid=%d) for cid=%d, pQuery %p\n", pSurface->id, pSurface->idAssociatedContext, pContext->id, pSurface->pQuery));
 
-    /* Release the previous query object. */
-    D3D_RELEASE(pSurface->pQuery);
-
-    /* Use the context where the texture has been created. */
-    int rc = vmsvga3dContextFromCid(pState, pSurface->idAssociatedContext, &pContext);
-    AssertRCReturn(rc, rc);
+    if (pSurface->idQueryContext == pContext->id)
+    {
+        /* Release the previous query object, if any. */
+        D3D_RELEASE(pSurface->pQuery);
+    }
+    else
+    {
+        /* Different context. There must be no pending drawing operations. If there are any, then a flush is missing. */
+        if (pSurface->pQuery)
+        {
+            /* Should not happen. */
+            AssertFailed();
+
+            /* Make sure that all drawing has completed. */
+            vmsvga3dSurfaceFlush(pSurface);
+        }
+        pSurface->idQueryContext = pContext->id;
+    }
 
     HRESULT hr = pContext->pDevice->CreateQuery(D3DQUERYTYPE_EVENT, &pSurface->pQuery);
@@ -1355 +1367 @@
 
 /* Wait for all drawing, that uses this surface, to finish. */
-int vmsvga3dSurfaceFlush(PVGASTATE pThis, PVMSVGA3DSURFACE pSurface)
+int vmsvga3dSurfaceFlush(PVMSVGA3DSURFACE pSurface)
 {
-    RT_NOREF(pThis);
 #ifndef VBOX_VMSVGA3D_WITH_WINE_OPENGL
     HRESULT hr;
@@ -1376 +1387 @@
         RTThreadSleep(1);
     }
+
+    D3D_RELEASE(pSurface->pQuery);
+
     AssertMsgReturn(hr == S_OK, ("vmsvga3dSurfaceFinishDrawing: GetData failed with %x\n", hr), VERR_INTERNAL_ERROR);
-
-    D3D_RELEASE(pSurface->pQuery);
 #endif /* !VBOX_VMSVGA3D_WITH_WINE_OPENGL */
 
@@ -1519 +1531 @@
 
         /* Must flush the other context's 3d pipeline to make sure all drawing is complete for the surface we're about to use. */
-        vmsvga3dSurfaceFlush(pThis, pSurfaceSrc);
-        vmsvga3dSurfaceFlush(pThis, pSurfaceDest);
+        vmsvga3dSurfaceFlush(pSurfaceSrc);
+        vmsvga3dSurfaceFlush(pSurfaceDest);
 
         IDirect3DSurface9 *pSrc;
@@ -1645 +1657 @@
                 {
                     /* Can lock both. */
-                    vmsvga3dSurfaceFlush(pThis, pSurfaceSrc);
-                    vmsvga3dSurfaceFlush(pThis, pSurfaceDest);
+                    vmsvga3dSurfaceFlush(pSurfaceSrc);
+                    vmsvga3dSurfaceFlush(pSurfaceDest);
 
                     D3DLOCKED_RECT LockedSrcRect;
@@ -1779 +1791 @@
             {
                 /* Must flush the context's 3d pipeline to make sure all drawing is complete for the surface we're about to use. */
-                vmsvga3dSurfaceFlush(pThis, pSurfaceSrc);
+                vmsvga3dSurfaceFlush(pSurfaceSrc);
 
                 hr = pD3DSurf->LockRect(&LockedSrcRect, &RectSrc, D3DLOCK_READONLY);
@@ -1801 +1813 @@
             {
                 /* Must flush the context's 3d pipeline to make sure all drawing is complete for the surface we're about to use. */
-                vmsvga3dSurfaceFlush(pThis, pSurfaceDest);
+                vmsvga3dSurfaceFlush(pSurfaceDest);
 
                 hr = pD3DSurf->LockRect(&LockedDestRect, &RectDest, 0);
@@ -1850 +1862 @@
 #endif
             AssertMsg(hr2 == D3D_OK, ("UpdateTexture failed with %x\n", hr2)); RT_NOREF(hr2);
+
+            /* Track the UpdateTexture operation. */
+            vmsvga3dSurfaceTrackUsage(pState, pContext, pSurfaceDest);
         }
 
@@ -2255 +2270 @@
             pSurface->pMipmapLevels[i].pSurfaceData = NULL;
         }
+
+        /* Track the UpdateTexture operation. */
+        vmsvga3dSurfaceTrackUsage(pState, pContext, pSurface);
     }
     pSurface->fDirty = false;
@@ -2288 +2306 @@
                                   SVGA3dStretchBltMode enmMode, PVMSVGA3DCONTEXT pContext)
 {
+    RT_NOREF(pThis);
+
     HRESULT hr;
     int rc;
@@ -2295 +2315 @@
 
     /* Flush the drawing pipeline for this surface as it could be used in a shared context. */
-    vmsvga3dSurfaceFlush(pThis, pSrcSurface);
-    vmsvga3dSurfaceFlush(pThis, pDstSurface);
+    vmsvga3dSurfaceFlush(pSrcSurface);
+    vmsvga3dSurfaceFlush(pDstSurface);
 
     RECT RectSrc;
@@ -4180 +4200 @@
 
         /* Must flush the other context's 3d pipeline to make sure all drawing is complete for the surface we're about to use. */
-        vmsvga3dSurfaceFlush(pThis, pRenderTarget);
+        vmsvga3dSurfaceFlush(pRenderTarget);
 
         if (pRenderTarget->surfaceFlags & SVGA3D_SURFACE_HINT_TEXTURE)
@@ -4453 +4473 @@
                            || pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_VOLUME_TEXTURE);
                     /* Must flush the other context's 3d pipeline to make sure all drawing is complete for the surface we're about to use. */
-                    vmsvga3dSurfaceFlush(pThis, pSurface);
+                    vmsvga3dSurfaceFlush(pSurface);
                 }
 

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp

@@ -509 +509 @@
 #ifdef VMSVGA3D_DIRECT3D
         /* Flush the drawing pipeline for this surface as it could be used in a shared context. */
-        vmsvga3dSurfaceFlush(pThis, pSurface);
+        vmsvga3dSurfaceFlush(pSurface);
 
 #else /* VMSVGA3D_OPENGL */