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

Timestamp:

May 6, 2010 11:24:35 AM (15 years ago)

Author:

vboxsync

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

61201

Message:

crOpenGL: fix issue when one 3d window is split between 2 monitors and other(s) isn't

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_context.c (modified) (4 diffs)
• server_window.c (modified) (1 diff)

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

@@ -182 +182 @@
 crServerDispatchMakeCurrent( GLint window, GLint nativeWindow, GLint context )
 {
-    CRMuralInfo *mural;
+    CRMuralInfo *mural, *oldMural;
     CRContext *ctx;
 
@@ -205 +205 @@
     }
     else {
+        oldMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, cr_server.currentWindow);
+        if (oldMural && oldMural->bUseFBO
+            && crServerSupportRedirMuralFBO()
+            && !crStateGetCurrent()->framebufferobject.drawFB)
+        {
+            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+        }
+
         ctx = cr_server.DummyContext;
         window = -1;
@@ -245 +253 @@
                     cr_server.currentWindow, window);
     */
+
+    oldMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, cr_server.currentWindow);
 
     if (1/*cr_server.firstCallMakeCurrent ||
@@ -266 +276 @@
     /* This used to be earlier, after crStateUpdateColorBits() call */
     crStateMakeCurrent( ctx );
-}
-
+
+    if (oldMural != mural && crServerSupportRedirMuralFBO())
+    {
+        if (!crStateGetCurrent()->framebufferobject.drawFB)
+        {
+            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mural->bUseFBO ? mural->idFBO:0);
+        }
+    }
+}
+

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

@@ -182 +182 @@
     {
         cr_server.currentWindow = -1;
+        crServerRedirMuralFBO(mural, GL_FALSE);
+        crServerDeleteMuralFBO(mural);
     }