Changeset 39834 in vbox for trunk/src/VBox

Timestamp:

Jan 23, 2012 10:19:24 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: adjust FBO switching logic a bit

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c

@@ -748 +748 @@
 }
 
-
 DECLEXPORT(void) STATE_APIENTRY
 crStateFramebufferObjectDisableHW(CRContext *ctx)
 {
+    GLboolean fAdjustDrawReadBuffers = GL_FALSE;
+
     if (ctx->framebufferobject.drawFB)
+    {
         diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
+        fAdjustDrawReadBuffers = GL_TRUE;
+    }
 
     if (ctx->framebufferobject.readFB)
+    {
         diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
-
-    if (ctx->framebufferobject.drawFB)
+        fAdjustDrawReadBuffers = GL_TRUE;
+    }
+
+    if (fAdjustDrawReadBuffers)
+    {
         diff_api.DrawBuffer(GL_BACK);
-    if (ctx->framebufferobject.readFB)
         diff_api.ReadBuffer(GL_BACK);
+    }
 
     if (ctx->framebufferobject.renderbuffer)
@@ -772 +780 @@
     GLboolean fAdjustDrawReadBuffers = GL_FALSE;
 
-    if (fromCtx->framebufferobject.drawFB
-            && fromCtx->framebufferobject.drawFB == toCtx->framebufferobject.drawFB)
+    if (fromCtx->framebufferobject.drawFB /* <- the FBO state was reset in crStateFramebufferObjectDisableHW */
+            && fromCtx->framebufferobject.drawFB == toCtx->framebufferobject.drawFB) /* .. and it was NOT restored properly in crStateFramebufferObjectSwitch */
     {
         diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, toCtx->framebufferobject.drawFB->hwid);
@@ -779 +787 @@
     }
 
-    if (fromCtx->framebufferobject.readFB
-            && fromCtx->framebufferobject.readFB == toCtx->framebufferobject.readFB)
+    if (fromCtx->framebufferobject.readFB /* <- the FBO state was reset in crStateFramebufferObjectDisableHW */
+            && fromCtx->framebufferobject.readFB == toCtx->framebufferobject.readFB) /* .. and it was NOT restored properly in crStateFramebufferObjectSwitch */
     {
         diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, toCtx->framebufferobject.readFB->hwid);
@@ -792 +800 @@
     }
 
-    if (fromCtx->framebufferobject.renderbuffer
-            && fromCtx->framebufferobject.renderbuffer==toCtx->framebufferobject.renderbuffer)
+    if (fromCtx->framebufferobject.renderbuffer /* <- the FBO state was reset in crStateFramebufferObjectDisableHW */
+            && fromCtx->framebufferobject.renderbuffer==toCtx->framebufferobject.renderbuffer) /* .. and it was NOT restored properly in crStateFramebufferObjectSwitch */
     {
         diff_api.BindRenderbufferEXT(GL_RENDERBUFFER_EXT, toCtx->framebufferobject.renderbuffer->hwid);