Changeset 44378 in vbox for trunk

Timestamp:

Jan 25, 2013 1:42:45 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: state buffer switch fix

File:

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

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

@@ -1046 +1046 @@
 crStateFramebufferObjectDisableHW(CRContext *ctx, GLuint idDrawFBO, GLuint idReadFBO)
 {
-    GLboolean fAdjustDrawReadBuffers = GL_FALSE;
+    GLenum idDrawBuffer = 0, idReadBuffer = 0;
 
     if (ctx->framebufferobject.drawFB || idDrawFBO)
     {
         diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
-        fAdjustDrawReadBuffers = GL_TRUE;
+        idDrawBuffer = ctx->buffer.drawBuffer;
     }
 
@@ -1057 +1057 @@
     {
         diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
-        fAdjustDrawReadBuffers = GL_TRUE;
-    }
-
-    if (fAdjustDrawReadBuffers)
-    {
-        diff_api.DrawBuffer(GL_BACK);
-        diff_api.ReadBuffer(GL_BACK);
-    }
-
-    if (ctx->framebufferobject.renderbuffer)
-        diff_api.BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
-}
-
-DECLEXPORT(void) STATE_APIENTRY
-crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx, GLuint idDrawFBO, GLuint idReadFBO)
-{
-    GLuint idReadBuffer = 0, idDrawBuffer = 0;
-    if (!fromCtx)
-        fromCtx = toCtx; /* <- in case fromCtx is zero, set it to toCtx to ensure framebuffer state gets re-enabled correctly */
-
-    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);
-        idDrawBuffer = toCtx->framebufferobject.drawFB->drawbuffer[0];
-    }
-    else if (idDrawFBO && !toCtx->framebufferobject.drawFB)
-    {
-        diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, idDrawFBO);
-        idDrawBuffer = GL_COLOR_ATTACHMENT0;
-    }
-
-    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);
-        idReadBuffer = toCtx->framebufferobject.readFB->readbuffer;
-    }
-    else if (idReadFBO && !toCtx->framebufferobject.readFB)
-    {
-        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, idReadFBO);
-        idReadBuffer = GL_COLOR_ATTACHMENT0;
+        idReadBuffer = ctx->buffer.readBuffer;
     }
 
@@ -1106 +1065 @@
         diff_api.ReadBuffer(idReadBuffer);
 
+    if (ctx->framebufferobject.renderbuffer)
+        diff_api.BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
+}
+
+DECLEXPORT(void) STATE_APIENTRY
+crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx, GLuint idDrawFBO, GLuint idReadFBO)
+{
+    GLuint idReadBuffer = 0, idDrawBuffer = 0;
+    if (!fromCtx)
+        fromCtx = toCtx; /* <- in case fromCtx is zero, set it to toCtx to ensure framebuffer state gets re-enabled correctly */
+
+    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);
+        idDrawBuffer = toCtx->framebufferobject.drawFB->drawbuffer[0];
+    }
+    else if (idDrawFBO && !toCtx->framebufferobject.drawFB)
+    {
+        diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, idDrawFBO);
+        idDrawBuffer = GL_COLOR_ATTACHMENT0;
+    }
+
+    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);
+        idReadBuffer = toCtx->framebufferobject.readFB->readbuffer;
+    }
+    else if (idReadFBO && !toCtx->framebufferobject.readFB)
+    {
+        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, idReadFBO);
+        idReadBuffer = GL_COLOR_ATTACHMENT0;
+    }
+
+    if (idDrawBuffer)
+        diff_api.DrawBuffer(idDrawBuffer);
+    if (idReadBuffer)
+        diff_api.ReadBuffer(idReadBuffer);
+
     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 */