Changeset 69965 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

Timestamp:

Dec 6, 2017 11:48:53 PM (7 years ago)

Author:

vboxsync

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

119468

Message:

Devices/Graphics: VMSVGA: sync the just created shared resource in D3D backend.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp (modified) (13 diffs)

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

@@ -1189 +1189 @@
 
 /* Get the shared surface copy or create a new one. */
-static PVMSVGA3DSHAREDSURFACE vmsvga3dSurfaceGetSharedCopy(PVMSVGA3DCONTEXT pContext, PVMSVGA3DSURFACE pSurface)
+static PVMSVGA3DSHAREDSURFACE vmsvga3dSurfaceGetSharedCopy(PVMSVGA3DSTATE pState, PVMSVGA3DCONTEXT pContext, PVMSVGA3DSURFACE pSurface)
 {
     Assert(pSurface->hSharedObject);
@@ -1255 +1255 @@
 
         if (RT_LIKELY(hr == D3D_OK))
-            /* likely */;
+        {
+            /* Make sure that the created shared copy has the same content as the original. */
+            PVMSVGA3DCONTEXT pAssociatedContext;
+            int rc = vmsvga3dContextFromCid(pState, pSurface->idAssociatedContext, &pAssociatedContext);
+            if (RT_SUCCESS(rc))
+            {
+                IDirect3DQuery9 *pQuery;
+                hr = pAssociatedContext->pDevice->CreateQuery(D3DQUERYTYPE_EVENT, &pQuery);
+                if (hr == D3D_OK)
+                {
+                    hr = pQuery->Issue(D3DISSUE_END);
+                    if (hr == D3D_OK)
+                    {
+                        do
+                        {
+                            hr = pQuery->GetData(NULL, 0, D3DGETDATA_FLUSH);
+                        } while (hr == S_FALSE);
+                    }
+
+                    D3D_RELEASE(pQuery);
+                }
+            }
+            else
+                AssertMsgFailed(("idAssociatedContext cid = %d, sid = %d\n", pSurface->idAssociatedContext, pSurface->id));
+        }
         else
         {
@@ -1347 +1371 @@
 /** Get IDirect3DSurface9 for the given face and mipmap.
  */
-int vmsvga3dGetD3DSurface(PVMSVGA3DCONTEXT pContext,
+int vmsvga3dGetD3DSurface(PVMSVGA3DSTATE pState,
+                          PVMSVGA3DCONTEXT pContext,
                           PVMSVGA3DSURFACE pSurface,
                           uint32_t face,
@@ -1376 +1401 @@
                      pSurface->id, pSurface->idAssociatedContext, pContext->id));
 
-            PVMSVGA3DSHAREDSURFACE pSharedSurface = vmsvga3dSurfaceGetSharedCopy(pContext, pSurface);
+            PVMSVGA3DSHAREDSURFACE pSharedSurface = vmsvga3dSurfaceGetSharedCopy(pState, pContext, pSurface);
             AssertReturn(pSharedSurface, VERR_INTERNAL_ERROR);
 
@@ -1481 +1506 @@
 
         IDirect3DSurface9 *pSrc;
-        rc = vmsvga3dGetD3DSurface(pContextDst, pSurfaceSrc, src.face, src.mipmap, false, &pSrc);
+        rc = vmsvga3dGetD3DSurface(pState, pContextDst, pSurfaceSrc, src.face, src.mipmap, false, &pSrc);
         AssertRCReturn(rc, rc);
 
         IDirect3DSurface9 *pDest;
-        rc = vmsvga3dGetD3DSurface(pContextDst, pSurfaceDest, dest.face, dest.mipmap, false, &pDest);
+        rc = vmsvga3dGetD3DSurface(pState, pContextDst, pSurfaceDest, dest.face, dest.mipmap, false, &pDest);
         AssertRCReturnStmt(rc, D3D_RELEASE(pSrc), rc);
 
@@ -1556 +1581 @@
             AssertRCReturn(rc, rc);
 
-            rc = vmsvga3dGetD3DSurface(pContext, pSurfaceSrc, src.face, src.mipmap, true, &pD3DSurf);
+            rc = vmsvga3dGetD3DSurface(pState, pContext, pSurfaceSrc, src.face, src.mipmap, true, &pD3DSurf);
             AssertRCReturn(rc, rc);
         }
@@ -1566 +1591 @@
             AssertRCReturn(rc, rc);
 
-            rc = vmsvga3dGetD3DSurface(pContext, pSurfaceDest, dest.face, dest.mipmap, true, &pD3DSurf);
+            rc = vmsvga3dGetD3DSurface(pState, pContext, pSurfaceDest, dest.face, dest.mipmap, true, &pD3DSurf);
             AssertRCReturn(rc, rc);
         }
@@ -2111 +2136 @@
 
     IDirect3DSurface9 *pSrc;
-    rc = vmsvga3dGetD3DSurface(pContext, pSrcSurface, uSrcFace, uSrcMipmap, false, &pSrc);
+    rc = vmsvga3dGetD3DSurface(pState, pContext, pSrcSurface, uSrcFace, uSrcMipmap, false, &pSrc);
     AssertRCReturn(rc, rc);
 
     IDirect3DSurface9 *pDst;
-    rc = vmsvga3dGetD3DSurface(pContext, pDstSurface, uDstFace, uDstMipmap, false, &pDst);
+    rc = vmsvga3dGetD3DSurface(pState, pContext, pDstSurface, uDstFace, uDstMipmap, false, &pDst);
     AssertRCReturn(rc, rc);
 
@@ -2190 +2215 @@
         /* Get the surface involved in the transfer. */
         IDirect3DSurface9 *pSurf;
-        rc = vmsvga3dGetD3DSurface(pContext, pSurface, uHostFace, uHostMipmap, true, &pSurf);
+        rc = vmsvga3dGetD3DSurface(pState, pContext, pSurface, uHostFace, uHostMipmap, true, &pSurf);
         AssertRCReturn(rc, rc);
 
@@ -2206 +2231 @@
                     /* Source is the texture, destination is the bounce texture. */
                     IDirect3DSurface9 *pSrc;
-                    rc = vmsvga3dGetD3DSurface(pContext, pSurface, uHostFace, uHostMipmap, false, &pSrc);
+                    rc = vmsvga3dGetD3DSurface(pState, pContext, pSurface, uHostFace, uHostMipmap, false, &pSrc);
                     AssertRCReturn(rc, rc);
 
@@ -2562 +2587 @@
     AssertMsgReturn(hr == D3D_OK, ("GetBackBuffer failed with %x\n", hr), VERR_INTERNAL_ERROR);
 
-    rc = vmsvga3dGetD3DSurface(pContext, pSurface, 0, 0, false, &pSurfaceD3D);
+    rc = vmsvga3dGetD3DSurface(pState, pContext, pSurface, 0, 0, false, &pSurfaceD3D);
     AssertRCReturn(rc, rc);
 
@@ -4345 +4370 @@
             }
 
-            rc = vmsvga3dGetD3DSurface(pContext,  pRenderTarget, target.face, target.mipmap, false, &pSurface);
+            rc = vmsvga3dGetD3DSurface(pState, pContext,  pRenderTarget, target.face, target.mipmap, false, &pSurface);
             AssertRCReturn(rc, rc);
         }
@@ -4612 +4637 @@
                     LogFunc(("Using texture sid=%x created for another context (%d vs %d)\n", sid, pSurface->idAssociatedContext, cid));
 
-                    PVMSVGA3DSHAREDSURFACE pSharedSurface = vmsvga3dSurfaceGetSharedCopy(pContext, pSurface);
+                    PVMSVGA3DSHAREDSURFACE pSharedSurface = vmsvga3dSurfaceGetSharedCopy(pState, pContext, pSurface);
                     AssertReturn(pSharedSurface, VERR_INTERNAL_ERROR);