Changeset 34053 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Nov 13, 2010 1:52:43 PM (14 years ago)

Author:

vboxsync

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

67735

Message:

crOpenGL/wddm: fix refcounting for shared ctx in shapshots

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_glstate.h (modified) (1 diff)
• state_tracker/state_init.c (modified) (1 diff)
• state_tracker/state_snapshot.c (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_glstate.h

@@ -227 +227 @@
 
 DECLEXPORT(void) STATE_APIENTRY crStateShareContext(GLboolean value);
+DECLEXPORT(void) STATE_APIENTRY crStateSetSharedContext(CRContext *pCtx);
+DECLEXPORT(GLboolean) STATE_APIENTRY crStateContextIsShared(CRContext *pCtx);
 #ifdef __cplusplus
 }

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c

@@ -126 +126 @@
         }
     }
+}
+
+DECLEXPORT(GLboolean) STATE_APIENTRY
+crStateContextIsShared(CRContext *pCtx)
+{
+    return pCtx->shared==gSharedState;
+}
+
+DECLEXPORT(void) STATE_APIENTRY
+crStateSetSharedContext(CRContext *pCtx)
+{
+    if (gSharedState)
+    {
+        crWarning("crStateSetSharedContext: shared is being changed from %p to %p", gSharedState, pCtx->shared);
+    }
+
+    gSharedState = pCtx->shared;
 }
 

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

@@ -1021 +1021 @@
 
     rc = SSMR3PutS32(pSSM, pContext->shared->id);
+    AssertRCReturn(rc, rc);
+
+    rc = SSMR3PutS32(pSSM, crStateContextIsShared(pContext));
+    AssertRCReturn(rc, rc);
+
     if (pContext->shared->refCount>1)
     {
@@ -1361 +1366 @@
     {
         crFindSharedCtxParms_t parms;
+        int32_t shared;
 
         rc = SSMR3GetS32(pSSM, &pContext->shared->id);
+        AssertRCReturn(rc, rc);
+
+        rc = SSMR3GetS32(pSSM, &shared);
         AssertRCReturn(rc, rc);
 
@@ -1372 +1381 @@
         if (pTmpContext->shared)
         {
-            CRASSERT(pContext->shared->refCount==1 && pTmpContext->shared->refCount>1);
+            CRASSERT(pContext->shared->refCount==1);
             bLoadShared = GL_FALSE;
             crStateFreeShared(pContext->shared);
             pContext->shared = NULL;
+            pTmpContext->shared->refCount++;
         }
         else
         {
             SLC_COPYPTR(shared);
+        }
+
+        if (bLoadShared && shared)
+        {
+            crStateSetSharedContext(pTmpContext);
         }
     }