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

Timestamp:

Mar 11, 2013 4:37:50 PM (12 years ago)

Author:

vboxsync

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

84221

Message:

crOpenGL/win: fix redraw concurrency

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_blitter.h (modified) (2 diffs)
• util/blitter.cpp (modified) (2 diffs)

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

@@ -88 +88 @@
     CR_BLITTER_CONTEXT *pRestoreCtxInfo;
     CR_BLITTER_WINDOW *pRestoreMural;
+    int32_t i32MakeCurrentUserData;
     SPUDispatchTable *pDispatch;
 } CR_BLITTER, *PCR_BLITTER;
@@ -109 +110 @@
 }
 
+DECLINLINE(void) CrBltSetMakeCurrentUserData(PCR_BLITTER pBlitter, int32_t i32MakeCurrentUserData)
+{
+    pBlitter->i32MakeCurrentUserData = i32MakeCurrentUserData;
+}
+
 VBOXBLITTERDECL(void) CrBltMuralSetCurrent(PCR_BLITTER pBlitter, CR_BLITTER_WINDOW *pMural);
 DECLINLINE(CR_BLITTER_WINDOW *) CrBltMuralGetCurrent(PCR_BLITTER pBlitter)

trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

@@ -74 +74 @@
 
     if (pMural)
-        pBlitter->pDispatch->MakeCurrent(pMural->Base.id, 0, pBlitter->CtxInfo.Base.id);
+        pBlitter->pDispatch->MakeCurrent(pMural->Base.id, pBlitter->i32MakeCurrentUserData, pBlitter->CtxInfo.Base.id);
     else
         pBlitter->pDispatch->MakeCurrent(0, 0, 0);
@@ -465 +465 @@
     }
 
-    pBlitter->pDispatch->MakeCurrent(pBlitter->pCurrentMural->Base.id, 0, pBlitter->CtxInfo.Base.id);
+    pBlitter->pDispatch->MakeCurrent(pBlitter->pCurrentMural->Base.id, pBlitter->i32MakeCurrentUserData, pBlitter->CtxInfo.Base.id);
 
     if (pBlitter->Flags.Initialized)