Changeset 41160 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

May 4, 2012 9:55:53 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: render to fbo fixes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_glstate.h (modified) (1 diff)
• include/state/cr_framebuffer.h (modified) (1 diff)
• state_tracker/state_diff.c (modified) (2 diffs)
• state_tracker/state_framebuffer.c (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_glstate.h

@@ -219 +219 @@
 DECLEXPORT(GLboolean) crStateEnableDiffOnMakeCurrent(GLboolean fEnable);
 
-CRContext * crStateSwichPrepare(CRContext *toCtx);
-void crStateSwichPostprocess(CRContext *fromCtx);
+CRContext * crStateSwichPrepare(CRContext *toCtx, GLboolean fMultipleContexts, GLuint idFBO);
+void crStateSwichPostprocess(CRContext *fromCtx, GLboolean fMultipleContexts, GLuint idFBO);
 
 DECLEXPORT(void) crStateFlushFunc( CRStateFlushFunc ff );

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h

@@ -75 +75 @@
 DECLEXPORT(void) STATE_APIENTRY crStateFramebufferObjectSwitch(CRContext *from, CRContext *to);
 
-DECLEXPORT(void) STATE_APIENTRY crStateFramebufferObjectDisableHW(CRContext *ctx);
-DECLEXPORT(void) STATE_APIENTRY crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx);
+DECLEXPORT(void) STATE_APIENTRY crStateFramebufferObjectDisableHW(CRContext *ctx, GLuint idFBO);
+DECLEXPORT(void) STATE_APIENTRY crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx, GLuint idFBO);
 
 DECLEXPORT(GLuint) STATE_APIENTRY crStateGetFramebufferHWID(GLuint id);

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

@@ -346 +346 @@
 }
 
-CRContext * crStateSwichPrepare(CRContext *toCtx)
+CRContext * crStateSwichPrepare(CRContext *toCtx, GLboolean fMultipleContexts, GLuint idFBO)
 {
     CRContext *fromCtx = GetCurrentContext();
 
+    if (!fMultipleContexts)
+    {
 #ifdef CR_EXT_framebuffer_object
-    if (fromCtx)
-        crStateFramebufferObjectDisableHW(fromCtx);
-#endif
-
+        if (fromCtx)
+            crStateFramebufferObjectDisableHW(fromCtx, idFBO);
+#endif
+    }
     return fromCtx;
 }
 
-void crStateSwichPostprocess(CRContext *fromCtx)
+void crStateSwichPostprocess(CRContext *fromCtx, GLboolean fMultipleContexts, GLuint idFBO)
 {
     CRContext *toCtx = GetCurrentContext();;
@@ -364 +366 @@
         return;
 
+    if (!fMultipleContexts)
+    {
 #ifdef CR_EXT_framebuffer_object
-    crStateFramebufferObjectReenableHW(fromCtx, toCtx);
-#endif
-}
+        crStateFramebufferObjectReenableHW(fromCtx, toCtx, idFBO);
+#endif
+    }
+}

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

@@ -775 +775 @@
 
 DECLEXPORT(void) STATE_APIENTRY
-crStateFramebufferObjectDisableHW(CRContext *ctx)
+crStateFramebufferObjectDisableHW(CRContext *ctx, GLuint idFBO)
 {
     GLboolean fAdjustDrawReadBuffers = GL_FALSE;
 
-    if (ctx->framebufferobject.drawFB)
+    if (ctx->framebufferobject.drawFB || idFBO)
     {
         diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
@@ -785 +785 @@
     }
 
-    if (ctx->framebufferobject.readFB)
+    if (ctx->framebufferobject.readFB ||idFBO)
     {
         diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
@@ -802 +802 @@
 
 DECLEXPORT(void) STATE_APIENTRY
-crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx)
+crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx, GLuint idFBO)
 {
     GLboolean fAdjustDrawReadBuffers = GL_FALSE;
 
-    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 */
+    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);
         fAdjustDrawReadBuffers = GL_TRUE;
     }
-
-    if (fromCtx->framebufferobject.readFB /* <- the FBO state was reset in crStateFramebufferObjectDisableHW */
+    else if (idFBO && !toCtx->framebufferobject.drawFB)
+    {
+        diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, idFBO);
+        fAdjustDrawReadBuffers = GL_TRUE;
+    }
+
+    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);
+        fAdjustDrawReadBuffers = GL_TRUE;
+    }
+    else if (idFBO && !toCtx->framebufferobject.readFB)
+    {
+        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, idFBO);
         fAdjustDrawReadBuffers = GL_TRUE;
     }