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

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: render to fbo fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_context.c (modified) (4 diffs)
• server_muralfbo.c (modified) (1 diff)

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

@@ -314 +314 @@
     CRASSERT(ctx);
 
+    oldMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, cr_server.currentWindow);
+
     /* Ubuntu 11.04 hosts misbehave if context window switch is
      * done with non-default framebuffer object settings.
@@ -319 +321 @@
      * crStateSwichPrepare restores the FBO state to its default values before the context window switch,
      * while crStateSwichPostprocess restores it back to the original values */
-    if (!cr_server.bUseMultipleContexts)
-        oldCtx = crStateSwichPrepare(ctx);
+    oldCtx = crStateSwichPrepare(ctx, cr_server.bUseMultipleContexts, oldMural && oldMural->bUseFBO && crServerSupportRedirMuralFBO() ? oldMural->idFBO : 0);
 
     /*
@@ -357 +358 @@
                     cr_server.currentWindow, window);
     */
-
-    oldMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, cr_server.currentWindow);
 
     if (1/*cr_server.firstCallMakeCurrent ||
@@ -384 +383 @@
     crStateMakeCurrent( ctx );
 
-
-    if (!cr_server.bUseMultipleContexts)
-        crStateSwichPostprocess(oldCtx);
-
-    if (oldMural != mural && crServerSupportRedirMuralFBO())
-    {
-        if (!crStateGetCurrent()->framebufferobject.drawFB)
-        {
-            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, mural->bUseFBO ? mural->idFBO:0);
-        }
-        if (!crStateGetCurrent()->framebufferobject.readFB)
-        {
-            cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, mural->bUseFBO ? mural->idFBO:0);
-        }
-    }
+    crStateSwichPostprocess(oldCtx, cr_server.bUseMultipleContexts, mural->bUseFBO && crServerSupportRedirMuralFBO() ? mural->idFBO : 0);
 
     if (!mural->bUseFBO)

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

@@ -198 +198 @@
 GLboolean crServerSupportRedirMuralFBO(void)
 {
-    const GLubyte* pExt = cr_server.head_spu->dispatch_table.GetString(GL_REAL_EXTENSIONS);
-
-    return ( NULL!=crStrstr((const char*)pExt, "GL_ARB_framebuffer_object")
-             || NULL!=crStrstr((const char*)pExt, "GL_EXT_framebuffer_object"))
-           && NULL!=crStrstr((const char*)pExt, "GL_ARB_texture_non_power_of_two");
+    static GLboolean fInited = GL_FALSE;
+    static GLboolean fSupported = GL_FALSE;
+    if (!fInited)
+    {
+        const GLubyte* pExt = cr_server.head_spu->dispatch_table.GetString(GL_REAL_EXTENSIONS);
+
+        fSupported = ( NULL!=crStrstr((const char*)pExt, "GL_ARB_framebuffer_object")
+                 || NULL!=crStrstr((const char*)pExt, "GL_EXT_framebuffer_object"))
+               && NULL!=crStrstr((const char*)pExt, "GL_ARB_texture_non_power_of_two");
+        fInited = GL_TRUE;
+    }
+    return fSupported;
 }