Changeset 44026 in vbox for trunk/src/VBox/HostServices

Timestamp:

Dec 4, 2012 7:01:04 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: fix saved state restore with VRDP+3D enabled

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

@@ -309 +309 @@
     GLenum status;
     SPUDispatchTable *gl = &cr_server.head_spu->dispatch_table;
+    CRContextInfo *pMuralContextInfo;
+    int RestoreSpuWindow = -1;
+    int RestoreSpuContext = -1;
 
     CRASSERT(mural->aidFBOs[0]==0);
     CRASSERT(mural->aidFBOs[1]==0);
+
+    pMuralContextInfo = cr_server.currentCtxInfo;
+    if (!pMuralContextInfo)
+    {
+        /* happens on saved state load */
+        CRASSERT(cr_server.MainContextInfo.SpuContext);
+        pMuralContextInfo = &cr_server.MainContextInfo;
+        cr_server.head_spu->dispatch_table.MakeCurrent(mural->spuWindow, 0, cr_server.MainContextInfo.SpuContext);
+        RestoreSpuWindow = 0;
+        RestoreSpuContext = 0;
+    }
+
+    if (pMuralContextInfo->CreateInfo.visualBits != mural->CreateInfo.visualBits)
+    {
+        crWarning("mural visual bits do not match with current context visual bits!");
+    }
 
     mural->cBuffers = 2;
@@ -394 +413 @@
     {
         gl->BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->bufferobject.unpackBuffer->hwid);
+    }
+
+    if (RestoreSpuWindow >= 0 && RestoreSpuContext >= 0)
+    {
+        cr_server.head_spu->dispatch_table.MakeCurrent(RestoreSpuWindow, 0, RestoreSpuContext);
     }
 }