Changeset 29205 in vbox for trunk/src

Timestamp:

May 7, 2010 12:55:08 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: delay FB update on non windows hosts untill framebuffer is resized to correct size

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_glstate.h (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_diff.c (modified) (2 diffs)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (1 diff)

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

@@ -191 +191 @@
 DECLEXPORT(void) crStateDiffContext( CRContext *from, CRContext *to );
 DECLEXPORT(void) crStateSwitchContext( CRContext *from, CRContext *to );
+DECLEXPORT(void) crStateApplyFBImage(CRContext *to);
 
 #ifndef IN_GUEST

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

@@ -121 +121 @@
 }
 
-void crStateSwitchContext( CRContext *from, CRContext *to )
+void crStateApplyFBImage(CRContext *to)
 {
-        CRbitvalue *bitID = to->bitid;
-        CRStateBits *sb = GetCurrentBits();
-
-        if (CHECKDIRTY(sb->attrib.dirty, bitID))
-        {
-                crStateAttribSwitch(&(sb->attrib), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->transform.dirty, bitID))
-        {
-                crStateTransformSwitch( &(sb->transform), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->pixel.dirty, bitID))
-        {
-                crStatePixelSwitch(&(sb->pixel), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->viewport.dirty, bitID))
-        {
-                crStateViewportSwitch(&(sb->viewport), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->fog.dirty, bitID))
-        {
-                crStateFogSwitch(&(sb->fog), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->texture.dirty, bitID))
-        {
-                crStateTextureSwitch( &(sb->texture), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->lists.dirty, bitID))
-        {
-                crStateListsSwitch(&(sb->lists), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->buffer.dirty, bitID))
-        {
-                crStateBufferSwitch( &(sb->buffer), bitID, from, to );
-        }
-#ifdef CR_ARB_vertex_buffer_object
-        if (CHECKDIRTY(sb->bufferobject.dirty, bitID))
-        {
-                crStateBufferObjectSwitch( &(sb->bufferobject), bitID, from, to );
-        }
-#endif
-        if (CHECKDIRTY(sb->client.dirty, bitID))
-        {
-                crStateClientSwitch( &(sb->client), bitID, from, to );
-        }
-#if 0
-        if (CHECKDIRTY(sb->hint.dirty, bitID))
-        {
-                crStateHintSwitch( &(sb->hint), bitID, from, to );
-        }
-#endif
-        if (CHECKDIRTY(sb->lighting.dirty, bitID))
-        {
-                crStateLightingSwitch( &(sb->lighting), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->occlusion.dirty, bitID))
-        {
-                crStateOcclusionSwitch( &(sb->occlusion), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->line.dirty, bitID))
-        {
-                crStateLineSwitch( &(sb->line), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->point.dirty, bitID))
-        {
-                crStatePointSwitch( &(sb->point), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->polygon.dirty, bitID))
-        {
-                crStatePolygonSwitch( &(sb->polygon), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->program.dirty, bitID))
-        {
-                crStateProgramSwitch( &(sb->program), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->stencil.dirty, bitID))
-        {
-                crStateStencilSwitch( &(sb->stencil), bitID, from, to );
-        }
-        if (CHECKDIRTY(sb->eval.dirty, bitID))
-        {
-                crStateEvaluatorSwitch( &(sb->eval), bitID, from, to );
-        }
-#ifdef CR_ARB_imaging
-        if (CHECKDIRTY(sb->imaging.dirty, bitID))
-        {
-                crStateImagingSwitch( &(sb->imaging), bitID, from, to );
-        }
-#endif
-#if 0
-        if (CHECKDIRTY(sb->selection.dirty, bitID))
-        {
-                crStateSelectionSwitch( &(sb->selection), bitID, from, to );
-        }
-#endif
-#ifdef CR_NV_register_combiners
-        if (CHECKDIRTY(sb->regcombiner.dirty, bitID) && to->extensions.NV_register_combiners)
-        {
-                crStateRegCombinerSwitch( &(sb->regcombiner), bitID, from, to );
-        }
-#endif
-#ifdef CR_ARB_multisample
-        if (CHECKDIRTY(sb->multisample.dirty, bitID))
-        {
-                crStateMultisampleSwitch( &(sb->multisample), bitID, from, to );
-        }
-#endif
-#ifdef CR_ARB_multisample
-        if (CHECKDIRTY(sb->multisample.dirty, bitID))
-        {
-                crStateMultisampleSwitch(&(sb->multisample), bitID, from, to );
-        }
-#endif
-#ifdef CR_EXT_framebuffer_object
-    /*Note, this should go after crStateTextureSwitch*/
-    crStateFramebufferObjectSwitch(from, to);
-#endif
-#ifdef CR_OPENGL_VERSION_2_0
-    crStateGLSLSwitch(from, to);
-#endif
-        if (CHECKDIRTY(sb->current.dirty, bitID))
-        {
-                crStateCurrentSwitch( &(sb->current), bitID, from, to );
-        }
-
     if (to->pImage)
     {
@@ -280 +155 @@
         diff_api.Finish();
 
+        crDebug("Applied %ix%i fb image", pVP->viewportW, pVP->viewportH);
+
         crFree(to->pImage);
         to->pImage = NULL;
     }
 }
+
+void crStateSwitchContext( CRContext *from, CRContext *to )
+{
+        CRbitvalue *bitID = to->bitid;
+        CRStateBits *sb = GetCurrentBits();
+
+        if (CHECKDIRTY(sb->attrib.dirty, bitID))
+        {
+                crStateAttribSwitch(&(sb->attrib), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->transform.dirty, bitID))
+        {
+                crStateTransformSwitch( &(sb->transform), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->pixel.dirty, bitID))
+        {
+                crStatePixelSwitch(&(sb->pixel), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->viewport.dirty, bitID))
+        {
+                crStateViewportSwitch(&(sb->viewport), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->fog.dirty, bitID))
+        {
+                crStateFogSwitch(&(sb->fog), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->texture.dirty, bitID))
+        {
+                crStateTextureSwitch( &(sb->texture), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->lists.dirty, bitID))
+        {
+                crStateListsSwitch(&(sb->lists), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->buffer.dirty, bitID))
+        {
+                crStateBufferSwitch( &(sb->buffer), bitID, from, to );
+        }
+#ifdef CR_ARB_vertex_buffer_object
+        if (CHECKDIRTY(sb->bufferobject.dirty, bitID))
+        {
+                crStateBufferObjectSwitch( &(sb->bufferobject), bitID, from, to );
+        }
+#endif
+        if (CHECKDIRTY(sb->client.dirty, bitID))
+        {
+                crStateClientSwitch( &(sb->client), bitID, from, to );
+        }
+#if 0
+        if (CHECKDIRTY(sb->hint.dirty, bitID))
+        {
+                crStateHintSwitch( &(sb->hint), bitID, from, to );
+        }
+#endif
+        if (CHECKDIRTY(sb->lighting.dirty, bitID))
+        {
+                crStateLightingSwitch( &(sb->lighting), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->occlusion.dirty, bitID))
+        {
+                crStateOcclusionSwitch( &(sb->occlusion), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->line.dirty, bitID))
+        {
+                crStateLineSwitch( &(sb->line), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->point.dirty, bitID))
+        {
+                crStatePointSwitch( &(sb->point), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->polygon.dirty, bitID))
+        {
+                crStatePolygonSwitch( &(sb->polygon), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->program.dirty, bitID))
+        {
+                crStateProgramSwitch( &(sb->program), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->stencil.dirty, bitID))
+        {
+                crStateStencilSwitch( &(sb->stencil), bitID, from, to );
+        }
+        if (CHECKDIRTY(sb->eval.dirty, bitID))
+        {
+                crStateEvaluatorSwitch( &(sb->eval), bitID, from, to );
+        }
+#ifdef CR_ARB_imaging
+        if (CHECKDIRTY(sb->imaging.dirty, bitID))
+        {
+                crStateImagingSwitch( &(sb->imaging), bitID, from, to );
+        }
+#endif
+#if 0
+        if (CHECKDIRTY(sb->selection.dirty, bitID))
+        {
+                crStateSelectionSwitch( &(sb->selection), bitID, from, to );
+        }
+#endif
+#ifdef CR_NV_register_combiners
+        if (CHECKDIRTY(sb->regcombiner.dirty, bitID) && to->extensions.NV_register_combiners)
+        {
+                crStateRegCombinerSwitch( &(sb->regcombiner), bitID, from, to );
+        }
+#endif
+#ifdef CR_ARB_multisample
+        if (CHECKDIRTY(sb->multisample.dirty, bitID))
+        {
+                crStateMultisampleSwitch( &(sb->multisample), bitID, from, to );
+        }
+#endif
+#ifdef CR_ARB_multisample
+        if (CHECKDIRTY(sb->multisample.dirty, bitID))
+        {
+                crStateMultisampleSwitch(&(sb->multisample), bitID, from, to );
+        }
+#endif
+#ifdef CR_EXT_framebuffer_object
+    /*Note, this should go after crStateTextureSwitch*/
+    crStateFramebufferObjectSwitch(from, to);
+#endif
+#ifdef CR_OPENGL_VERSION_2_0
+    crStateGLSLSwitch(from, to);
+#endif
+        if (CHECKDIRTY(sb->current.dirty, bitID))
+        {
+                crStateCurrentSwitch( &(sb->current), bitID, from, to );
+        }
+
+#ifdef WINDOWS
+    crStateApplyFBImage(to);
+#endif
+}

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

@@ -1123 +1123 @@
 
     crHashtableWalk(cr_server.muralTable, crVBoxServerCheckMuralCB, NULL);
+
+#ifndef WINDOWS
+    /*Restore FB content for clients, which have current window on a screen being remapped*/
+    {
+        GLint i;
+
+        for (i = 0; i < cr_server.numClients; i++)
+        {
+            cr_server.curClient = cr_server.clients[i];
+            if (cr_server.curClient->currentCtx
+                && cr_server.curClient->currentCtx->pImage
+                && cr_server.curClient->currentMural 
+                && cr_server.curClient->currentMural->screenId == sIndex
+                && cr_server.curClient->currentCtx->viewport.viewportH == h
+                && cr_server.curClient->currentCtx->viewport.viewportW == w)
+            {
+                int clientWindow = cr_server.curClient->currentWindow;
+                int clientContext = cr_server.curClient->currentContextNumber;
+
+                if (clientWindow && clientWindow != cr_server.currentWindow)
+                {
+                    crServerDispatchMakeCurrent(clientWindow, 0, clientContext);
+                }
+
+                crStateApplyFBImage(cr_server.curClient->currentCtx);
+            }
+        }
+        cr_server.curClient = NULL;
+    }
+#endif
     
     return VINF_SUCCESS;