Changeset 40388 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

Timestamp:

Mar 7, 2012 12:44:46 PM (13 years ago)

Author:

vboxsync

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

76694

Message:

wddm/3d: shared resource destroy handling fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp (modified) (5 diffs)

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

@@ -3130 +3130 @@
             if (RT_SUCCESS(rc))
             {
-                rc = VbglR3Init();
-                AssertRC(rc);
-                if (RT_SUCCESS(rc))
+//                rc = VbglR3Init();
+//                AssertRC(rc);
+//                if (RT_SUCCESS(rc))
                 {
                     HRESULT hr = vboxDispCmInit();
@@ -3146 +3146 @@
                         }
                     }
-                    VbglR3Term();
+//                    VbglR3Term();
                 }
             }
@@ -3169 +3169 @@
                 if (hr == S_OK)
                 {
-                    VbglR3Term();
+//                    VbglR3Term();
                     /// @todo RTR3Term();
                     return TRUE;
@@ -5672 +5672 @@
         for (UINT i = 0; i < pRc->cAllocations; ++i)
         {
-            BOOL fSetDontDelete = FALSE;
+            BOOL fSetDelete = FALSE;
             PVBOXWDDMDISP_ALLOCATION pAlloc = &pRc->aAllocations[i];
             if (pAlloc->hSharedHandle)
             {
+                /* using one and the same shared resource by different clients could lead to the situation where one client can still refer to the resource
+                 * while another one has deleted it
+                 * this could lead to gl state corruption on both host and guest side.
+                 * This is why we take extra care to avoid it.
+                 * Until we do a vboxWddmShRcRefAlloc call below the resource is guarantied to be present, however it can be removed any time after the call
+                 * if cShRcRefs is non-zero, i.e. the current cliet is not the one deleting it.
+                 * We first explicitely say to wine that resource must NOT be accessed any more and that all references to it should be cleaned */
+                pAdapter->D3D.pfnVBoxWineExD3DRc9SetShRcState((IDirect3DResource9*)pAlloc->pD3DIf, VBOXWINEEX_SHRC_STATE_GL_DISABLE);
+
                 DWORD cShRcRefs;
                 HRESULT tmpHr = vboxWddmShRcRefAlloc(pDevice, pAlloc, FALSE, &cShRcRefs);
-                if (cShRcRefs)
-                {
-                    fSetDontDelete = TRUE;
+                if (!cShRcRefs)
+                {
+                    /* the current client IS the one deleting this resource */
+                    fSetDelete = TRUE;
                 }
 #ifdef DEBUG_misha
@@ -5692 +5702 @@
             }
 
-            if (fSetDontDelete)
+            if (fSetDelete)
             {
                 Assert(pAlloc->pD3DIf);
-                pAdapter->D3D.pfnVBoxWineExD3DRc9SetDontDeleteGl((IDirect3DResource9*)pAlloc->pD3DIf);
+                pAdapter->D3D.pfnVBoxWineExD3DRc9SetShRcState((IDirect3DResource9*)pAlloc->pD3DIf, VBOXWINEEX_SHRC_STATE_GL_DELETE);
             }