Changeset 41380 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

May 21, 2012 7:22:05 PM (13 years ago)

Author:

vboxsync

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

78074

Message:

VRDP+3D: 3D rendering speedup: avoid unnecessary host GPU->guest VRAM->VRDP data transfers

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_clear.c (modified) (4 diffs)
• server_context.c (modified) (1 diff)
• server_framebuffer.c (modified) (1 diff)
• server_main.c (modified) (1 diff)
• server_misc.c (modified) (1 diff)
• server_window.c (modified) (1 diff)

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

@@ -195 +195 @@
 {
   CRMuralInfo *mural;
+  CRContext *ctx;
+
 #ifdef VBOXCR_LOGFPS
   static VBOXCRFPS Fps;
@@ -424 +426 @@
                 window = 0;
 
+        ctx = crStateGetCurrent();
+
+    if (ctx->framebufferobject.drawFB
+            || (ctx->buffer.drawBuffer != GL_FRONT && ctx->buffer.drawBuffer != GL_FRONT_LEFT))
+        cr_server.curClient->currentMural->bFbDraw = GL_FALSE;
+
     if (crServerIsRedirectedToFBO())
     {
@@ -437 +445 @@
 crServerDispatchFlush(void)
 {
+    CRContext *ctx = crStateGetCurrent();
     cr_server.head_spu->dispatch_table.Flush();
 
-    if (crServerIsRedirectedToFBO())
-    {
+    if (!cr_server.curClient->currentMural) /* <- on window destroy this will be zero */
+        return;
+
+    if (cr_server.curClient->currentMural->bFbDraw && crServerIsRedirectedToFBO())
+    {
+#ifdef DEBUG_misha
+        CRASSERT(0);
+#endif
         crServerPresentFBO(cr_server.curClient->currentMural);
     }
+
+    if (ctx->framebufferobject.drawFB
+            || (ctx->buffer.drawBuffer != GL_FRONT && ctx->buffer.drawBuffer != GL_FRONT_LEFT))
+        cr_server.curClient->currentMural->bFbDraw = GL_FALSE;
 }
 
@@ -448 +467 @@
 crServerDispatchFinish(void)
 {
+    CRContext *ctx = crStateGetCurrent();
+
     cr_server.head_spu->dispatch_table.Finish();
 
-    if (crServerIsRedirectedToFBO())
-    {
+    if (cr_server.curClient->currentMural->bFbDraw && crServerIsRedirectedToFBO())
+    {
+#ifdef DEBUG_misha
+        CRASSERT(0);
+#endif
         crServerPresentFBO(cr_server.curClient->currentMural);
     }
-}
+
+    if (ctx->framebufferobject.drawFB
+            || (ctx->buffer.drawBuffer != GL_FRONT && ctx->buffer.drawBuffer != GL_FRONT_LEFT))
+        cr_server.curClient->currentMural->bFbDraw = GL_FALSE;
+}

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

@@ -389 +389 @@
     crStateSwichPostprocess(oldCtx, cr_server.bUseMultipleContexts, mural->bUseFBO && crServerSupportRedirMuralFBO() ? mural->idFBO : 0);
 
+    if (!ctx->framebufferobject.drawFB
+            && (ctx->buffer.drawBuffer == GL_FRONT || ctx->buffer.drawBuffer == GL_FRONT_LEFT))
+        cr_server.curClient->currentMural->bFbDraw = GL_TRUE;
+
     if (!mural->bUseFBO)
     {

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

@@ -64 +64 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchBindFramebufferEXT(GLenum target, GLuint framebuffer)
 {
+#ifdef DEBUG_misha
+    GLint rfb = 0, dfb = 0;
+#endif
         crStateBindFramebufferEXT(target, framebuffer);
+
+    if (0==framebuffer)
+    {
+        CRContext *ctx = crStateGetCurrent();
+        if (ctx->buffer.drawBuffer == GL_FRONT || ctx->buffer.drawBuffer == GL_FRONT_LEFT)
+            cr_server.curClient->currentMural->bFbDraw = GL_TRUE;
+    }
 
     if (0==framebuffer && crServerIsRedirectedToFBO())
     {
         cr_server.head_spu->dispatch_table.BindFramebufferEXT(target, cr_server.curClient->currentMural->idFBO);
+#ifdef DEBUG_misha
+        Assert(0);
+        cr_server.head_spu->dispatch_table.GetIntegerv(GL_READ_FRAMEBUFFER_BINDING_EXT, &rfb);
+        cr_server.head_spu->dispatch_table.GetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING_EXT, &dfb);
+        if (GL_FRAMEBUFFER_EXT == target)
+        {
+            Assert(rfb == cr_server.curClient->currentMural->idFBO);
+            Assert(dfb == cr_server.curClient->currentMural->idFBO);
+        }
+        else if (GL_READ_FRAMEBUFFER_EXT == target)
+        {
+            Assert(rfb == cr_server.curClient->currentMural->idFBO);
+        }
+        else if (GL_DRAW_FRAMEBUFFER_EXT == target)
+        {
+            Assert(dfb == cr_server.curClient->currentMural->idFBO);
+        }
+        else
+        {
+            Assert(0);
+        }
+#endif
     }
     else
     {
         cr_server.head_spu->dispatch_table.BindFramebufferEXT(target, crStateGetFramebufferHWID(framebuffer));
+#ifdef DEBUG_misha
+        cr_server.head_spu->dispatch_table.GetIntegerv(GL_READ_FRAMEBUFFER_BINDING_EXT, &rfb);
+        cr_server.head_spu->dispatch_table.GetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING_EXT, &dfb);
+        if (GL_FRAMEBUFFER_EXT == target)
+        {
+            Assert(rfb == crStateGetFramebufferHWID(framebuffer));
+            Assert(dfb == crStateGetFramebufferHWID(framebuffer));
+        }
+        else if (GL_READ_FRAMEBUFFER_EXT == target)
+        {
+            Assert(rfb == crStateGetFramebufferHWID(framebuffer));
+        }
+        else if (GL_DRAW_FRAMEBUFFER_EXT == target)
+        {
+            Assert(dfb == crStateGetFramebufferHWID(framebuffer));
+        }
+        else
+        {
+            Assert(0);
+        }
+#endif
     }
 }

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

@@ -1035 +1035 @@
         AssertRCReturn(rc, rc);
 
+        if (version <= SHCROGL_SSM_VERSION_BEFORE_FRONT_DRAW_TRACKING)
+            muralInfo.bFbDraw = GL_TRUE;
+
         if (muralInfo.pVisibleRects)
         {

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

@@ -872 +872 @@
     crStateDrawBuffer( mode );
 
-    if (cr_server.curClient->currentMural->bUseFBO && crServerIsRedirectedToFBO()
-            && cr_server.curClient->currentMural->idFBO
-            && !crStateGetCurrent()->framebufferobject.drawFB)
+    if (!crStateGetCurrent()->framebufferobject.drawFB)
     {
-        switch (mode)
-        {
-            case GL_BACK:
-            case GL_BACK_LEFT:
-                mode = GL_COLOR_ATTACHMENT0;
-                break;
-            case GL_FRONT:
-            case GL_FRONT_LEFT:
-                crWarning("GL_FRONT not supported for FBO mode! (0x%x)", mode);
-                mode = GL_COLOR_ATTACHMENT0;
-                break;
-            default:
-                crWarning("unexpected mode! 0x%x", mode);
-                break;
+        if (mode == GL_FRONT || mode == GL_FRONT_LEFT)
+            cr_server.curClient->currentMural->bFbDraw = GL_TRUE;
+
+        if (cr_server.curClient->currentMural->bUseFBO && crServerIsRedirectedToFBO()
+                && cr_server.curClient->currentMural->idFBO)
+        {
+            switch (mode)
+            {
+                case GL_BACK:
+                case GL_BACK_LEFT:
+                    mode = GL_COLOR_ATTACHMENT0;
+                    break;
+                case GL_FRONT:
+                case GL_FRONT_LEFT:
+                    crDebug("Setting GL_FRONT with FBO mode! (0x%x)", mode);
+                    mode = GL_COLOR_ATTACHMENT0;
+                    break;
+                default:
+                    crWarning("unexpected mode! 0x%x", mode);
+                    break;
+            }
         }
     }

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

@@ -276 +276 @@
 
     /* Work-around Intel driver bug */
-    CRASSERT(cr_server.curClient->currentMural == mural);
-    if (cr_server.curClient->currentMural == mural)
+    CRASSERT(!cr_server.curClient
+            || cr_server.curClient->currentMural == mural);
+    if (cr_server.curClient && cr_server.curClient->currentMural == mural)
     {
         CRContextInfo * ctxInfo = cr_server.currentCtxInfo;