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

Timestamp:

May 15, 2013 5:12:08 AM (12 years ago)

Author:

vboxsync

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

85761

Message:

crOpenGL: some blitter fixes

File:

• trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp (modified) (3 diffs)

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

@@ -100 +100 @@
     else
     {
+        if (CrBltIsEntered(pBlitter))
+        {
+            crWarning("can not set null mural for entered bleater");
+            return VERR_INVALID_STATE;
+        }
         if (!pBlitter->CurrentMural.Base.id)
             return VINF_SUCCESS;
@@ -117 +122 @@
     pBlitter->pDispatch->Flush();
 
-    if (pMural)
-        pBlitter->pDispatch->MakeCurrent(pMural->Base.id, pBlitter->i32MakeCurrentUserData, pBlitter->CtxInfo.Base.id);
-    else
-        pBlitter->pDispatch->MakeCurrent(0, 0, 0);
+    pBlitter->pDispatch->MakeCurrent(pMural->Base.id, pBlitter->i32MakeCurrentUserData, pBlitter->CtxInfo.Base.id);
 
     return VINF_SUCCESS;
@@ -555 +557 @@
     if (pBlitter->CurrentMural.Base.id) /* <- pBlitter->CurrentMural.Base.id can be null if the blitter is in a "no-context" mode (see comments to BltInit for detail)*/
     {
-        pBlitter->pDispatch->Flush();
+        if (pRestoreCtxInfo)
+            pBlitter->pDispatch->Flush();
         pBlitter->pDispatch->MakeCurrent(pBlitter->CurrentMural.Base.id, pBlitter->i32MakeCurrentUserData, pBlitter->CtxInfo.Base.id);
     }