Changeset 44740 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

Timestamp:

Feb 18, 2013 5:02:47 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: OSX backend rework; oddscreen rendering generalization

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c (modified) (7 diffs)

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

@@ -20 +20 @@
 #include "cr_string.h"
 #include "cr_mem.h"
+#include "cr_vreg.h"
 #include "render/renderspu.h"
 
@@ -315 +316 @@
     CRASSERT(mural->aidFBOs[0]==0);
     CRASSERT(mural->aidFBOs[1]==0);
+    CRASSERT(mural->width == mural->CEntry.Tex.width);
+    CRASSERT(mural->height == mural->CEntry.Tex.height);
 
     pMuralContextInfo = cr_server.currentCtxInfo;
@@ -415 +418 @@
     }
 
+    CRASSERT(mural->aidColorTexs[CR_SERVER_FBO_FB_IDX(mural)]);
+    CrVrScrCompositorEntryTexNameUpdate(&mural->CEntry, mural->aidColorTexs[CR_SERVER_FBO_FB_IDX(mural)]);
+
     if (RestoreSpuWindow >= 0 && RestoreSpuContext >= 0)
     {
@@ -512 +518 @@
     GLuint idPBO;
     CRContext *ctx = crStateGetCurrent();
-    CR_BLITTER_TEXTURE Tex;
+    VBOXVR_TEXTURE Tex;
 
     CRASSERT(mural->fUseFBO);
@@ -524 +530 @@
     if (!mural->width || !mural->height)
     {
+        return;
+    }
+
+    if (!CrVrScrCompositorEntryIsInList(&mural->CEntry))
+        return;
+
+    if (mural->fUseFBO == CR_SERVER_REDIR_FBO_BLT)
+    {
+        GLuint idDrawFBO, idReadFBO;
+
+        idDrawFBO = mural->aidFBOs[mural->iCurDrawBuffer];
+        idReadFBO = mural->aidFBOs[mural->iCurReadBuffer];
+
+        crStateSwitchPrepare(NULL, ctx, idDrawFBO, idReadFBO);
+
+        cr_server.head_spu->dispatch_table.VBoxPresentComposition(mural->spuWindow, &mural->Compositor, &mural->CEntry);
+
+        crStateSwitchPostprocess(ctx, NULL, idDrawFBO, idReadFBO);
+
         return;
     }
@@ -532 +557 @@
     Tex.hwid = mural->aidColorTexs[CR_SERVER_FBO_FB_IDX(mural)];
     CRASSERT(Tex.hwid);
-
-    if (mural->fUseFBO == CR_SERVER_REDIR_FBO_BLT)
-    {
-        int rc;
-        PCR_BLITTER pBlitter = crServerGetFBOPresentBlitter(mural);
-        if (!pBlitter)
-        {
-            static int cPrintedWarnings = 0;
-            if (++cPrintedWarnings <= 5)
-            {
-                crWarning("crServerGetFBOPresentBlitter returned no blitter %d", cPrintedWarnings);
-                if (cPrintedWarnings == 5)
-                    crWarning("won't print the above crServerGetFBOPresentBlitter warning any more", cPrintedWarnings);
-            }
-            return;
-        }
-
-        CrBltMuralSetCurrent(pBlitter, mural);
-        rc = CrBltEnter(pBlitter, cr_server.currentCtxInfo, cr_server.currentMural);
-        if (RT_SUCCESS(rc))
-        {
-            RTRECT Rect;
-            Rect.xLeft = 0;
-            Rect.yTop = 0;
-            Rect.xRight = Tex.width;
-            Rect.yBottom = Tex.height;
-
-            CrBltBlitTexMural(pBlitter, &Tex, &Rect, &Rect, 1, 0);
-            CrBltPresent(pBlitter);
-
-            CrBltLeave(pBlitter);
-        }
-        else
-        {
-            crWarning("CrBltEnter failed rc %d", rc);
-            return;
-        }
-        return;
-    }
 
     if (cr_server.bUsePBOForReadback && !mural->idPBO)
@@ -687 +673 @@
         cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, mural->aidFBOs[mural->iCurReadBuffer]);
     }
-}
+    Assert(mural->aidColorTexs[CR_SERVER_FBO_FB_IDX(mural)]);
+    CrVrScrCompositorEntryTexNameUpdate(&mural->CEntry, mural->aidColorTexs[CR_SERVER_FBO_FB_IDX(mural)]);
+}