Changeset 37394 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Jun 9, 2011 3:25:30 PM (14 years ago)

Author:

vboxsync

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

72190

Message:

Wddm/3D: fixed random screen corruption when running 3d apps under aero on win7

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_context.c (modified) (2 diffs)
• server_muralfbo.c (modified) (3 diffs)

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

@@ -231 +231 @@
     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);
+        if (oldMural && oldMural->bUseFBO && crServerSupportRedirMuralFBO())
+        {
+            if (!crStateGetCurrent()->framebufferobject.drawFB)
+            {
+                cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
+            }
+            if (!crStateGetCurrent()->framebufferobject.readFB)
+            {
+                cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
+            }
         }
 
@@ -306 +311 @@
         if (!crStateGetCurrent()->framebufferobject.drawFB)
         {
-            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mural->bUseFBO ? mural->idFBO:0);
-        }
-    }
-}
-
+            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, mural->bUseFBO ? mural->idFBO:0);
+        }
+        if (!crStateGetCurrent()->framebufferobject.readFB)
+        {
+            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, mural->bUseFBO ? mural->idFBO:0);
+        }
+    }
+}
+

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

@@ -224 +224 @@
         if (!crStateGetCurrent()->framebufferobject.drawFB)
         {
-            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mural->idFBO);
+            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, mural->idFBO);
+        }
+        if (!crStateGetCurrent()->framebufferobject.readFB)
+        {
+            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, mural->idFBO);
         }
     }
@@ -231 +235 @@
         cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, mural->bVisible);
 
-        if (mural->bUseFBO && crServerSupportRedirMuralFBO()
-            && !crStateGetCurrent()->framebufferobject.drawFB)
-        {
-            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+        if (mural->bUseFBO && crServerSupportRedirMuralFBO())
+        {
+            if (!crStateGetCurrent()->framebufferobject.drawFB)
+            {
+                cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
+            }
+            if (!crStateGetCurrent()->framebufferobject.readFB)
+            {
+                cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
+            }
         }
     }
@@ -312 +322 @@
 
     uid = ctx->framebufferobject.drawFB ? ctx->framebufferobject.drawFB->hwid:0;
-    gl->BindFramebufferEXT(GL_FRAMEBUFFER_EXT, uid);
+    gl->BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, uid);
+
+    uid = ctx->framebufferobject.readFB ? ctx->framebufferobject.readFB->hwid:0;
+    gl->BindFramebufferEXT(GL_READ_FRAMEBUFFER, uid);
 
     if (crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))