Changeset 43980 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Nov 28, 2012 7:10:56 AM (12 years ago)

Author:

vboxsync

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

82344

Message:

crOpenGL: double-buffering for offscreen rendering, bugxifes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

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

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

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

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

@@ -105 +105 @@
     GLboolean   bReceivedRects;   /*indicates if guest did any updates for visible regions*/
 
-    GLuint idFBO, idColorTex, idDepthStencilRB;
+    GLuint cBuffers;
+    GLuint iBbBuffer;
+    GLuint aidFBOs[2];
+    GLuint aidColorTexs[2];
+
+    void *pvOutputRedirectInstance;
+
+    CRCreateInfo_t CreateInfo;
+
+    /* to avoid saved state breakage we need to keep RT_OFFSETOF(CRMuralInfo, CreateInfo) intact
+     * this is why we place some FBO stuff to the tail
+     * @todo: once we need to increment a saved state version, we could refactor this structure */
+    GLuint iCurDrawBuffer;
+    GLuint iCurReadBuffer;
+
+    GLuint idDepthStencilRB;
     GLuint fboWidth, fboHeight;
     GLuint idPBO;
-
-    void *pvOutputRedirectInstance;
-
-    CRCreateInfo_t CreateInfo;
 } CRMuralInfo;
 

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, GLuint idFBO);
-DECLEXPORT(void) STATE_APIENTRY crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx, GLuint idFBO);
+DECLEXPORT(void) STATE_APIENTRY crStateFramebufferObjectDisableHW(CRContext *ctx, GLuint idDrawFBO, GLuint idReadFBO);
+DECLEXPORT(void) STATE_APIENTRY crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx, GLuint idDrawFBO, GLuint idReadFBO);
 
 DECLEXPORT(GLuint) STATE_APIENTRY crStateGetFramebufferHWID(GLuint id);

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

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

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

@@ -775 +775 @@
 
 DECLEXPORT(void) STATE_APIENTRY
-crStateFramebufferObjectDisableHW(CRContext *ctx, GLuint idFBO)
+crStateFramebufferObjectDisableHW(CRContext *ctx, GLuint idDrawFBO, GLuint idReadFBO)
 {
     GLboolean fAdjustDrawReadBuffers = GL_FALSE;
 
-    if (ctx->framebufferobject.drawFB || idFBO)
+    if (ctx->framebufferobject.drawFB || idDrawFBO)
     {
         diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
@@ -785 +785 @@
     }
 
-    if (ctx->framebufferobject.readFB ||idFBO)
+    if (ctx->framebufferobject.readFB || idReadFBO)
     {
         diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
@@ -802 +802 @@
 
 DECLEXPORT(void) STATE_APIENTRY
-crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx, GLuint idFBO)
+crStateFramebufferObjectReenableHW(CRContext *fromCtx, CRContext *toCtx, GLuint idDrawFBO, GLuint idReadFBO)
 {
     GLuint idReadBuffer = 0, idDrawBuffer = 0;
@@ -812 +812 @@
         idDrawBuffer = toCtx->framebufferobject.drawFB->drawbuffer[0];
     }
-    else if (idFBO && !toCtx->framebufferobject.drawFB)
-    {
-        diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, idFBO);
+    else if (idDrawFBO && !toCtx->framebufferobject.drawFB)
+    {
+        diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, idDrawFBO);
         idDrawBuffer = GL_COLOR_ATTACHMENT0;
     }
@@ -824 +824 @@
         idReadBuffer = toCtx->framebufferobject.readFB->readbuffer;
     }
-    else if (idFBO && !toCtx->framebufferobject.readFB)
-    {
-        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, idFBO);
+    else if (idReadFBO && !toCtx->framebufferobject.readFB)
+    {
+        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, idReadFBO);
         idReadBuffer = GL_COLOR_ATTACHMENT0;
     }