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

Timestamp:

Jan 20, 2012 9:32:29 AM (13 years ago)

Author:

vboxsync

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

75809

Message:

crOpenGL: work around Ubuntu 11.04 FBO issues

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_context.c (modified) (3 diffs)
• unpacker/unpack.py (modified) (2 diffs)

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

@@ -231 +231 @@
 {
     CRMuralInfo *mural, *oldMural;
-    CRContext *ctx;
+    CRContext *ctx, *oldCtx;
 
     if (context >= 0 && window >= 0) {
@@ -267 +267 @@
         return;
     }
+
+    /* Ubuntu 11.04 hosts misbehave if context window switch is
+     * done with non-default framebuffer object settings.
+     * crStateSwichPrepare & crStateSwichPostprocess are supposed to work around this problem
+     * crStateSwichPrepare restores the FBO state to its default values before the context window switch,
+     * while crStateSwichPostprocess restores it back to the original values */
+    oldCtx = crStateSwichPrepare(ctx);
 
     /*
@@ -326 +333 @@
     crStateMakeCurrent( ctx );
 
+    crStateSwichPostprocess(oldCtx);
+
     if (oldMural != mural && crServerSupportRedirMuralFBO())
     {

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack.py

@@ -227 +227 @@
     for (i = 0 ; i < num_opcodes ; i++)
     {
+    
+        CRDBGPTR_CHECKZ(writeback_ptr);
+        CRDBGPTR_CHECKZ(return_ptr);
+    
         /*crDebug(\"Unpacking opcode \%d\", *unpack_opcodes);*/
         switch( *unpack_opcodes )
@@ -263 +267 @@
                 break;
         }
+        
+        CRDBGPTR_CHECKZ(writeback_ptr);
+        CRDBGPTR_CHECKZ(return_ptr);
+        
         unpack_opcodes--;
     }