Changeset 45577 in vbox

Timestamp:

Apr 16, 2013 5:33:59 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: fix window mgmt

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_config.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_misc.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_window.c (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu.c (modified) (2 diffs)
• HostServices/SharedOpenGL/render/renderspu.h (modified) (1 diff)

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

@@ -522 +522 @@
     GLboolean             bUseMultipleContexts;
 
+    GLboolean             bWindowsInitiallyHidden;
+
     /* @todo: should we use just one blitter?
      * we use two currently because the drawable attribs can differ*/

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

@@ -57 +57 @@
     cr_server.bUsePBOForReadback = GL_FALSE;
     cr_server.bUseOutputRedirect = GL_FALSE;
+    cr_server.bWindowsInitiallyHidden = GL_FALSE;
 }
 

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

@@ -239 +239 @@
         cr_server.currentEye = value ? 1 : 0;
         break;
+    case GL_HOST_WND_CREATED_HIDDEN:
+        cr_server.bWindowsInitiallyHidden = value ? 1 : 0;
+        break;
     default:
         /* Pass the parameter info to the head SPU */

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

@@ -79 +79 @@
     mural->height = dims[1];
     
-    cr_server.head_spu->dispatch_table.GetChromiumParametervCR(GL_WINDOW_VISIBILITY_CR, spuWindow, GL_INT, 1, dims);
-
     mural->spuWindow = spuWindow;
     mural->screenId = 0;
     mural->fHasParentWindow = !!cr_server.screen[0].winID;
-    mural->bVisible = !!dims[0];
+    mural->bVisible = cr_server.bWindowsInitiallyHidden;
     mural->fPresentMode = CR_SERVER_REDIR_F_NONE;
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -467 +467 @@
     crHashtableAdd(render_spu.windowTable, id, window);
 
-    if (render_spu.force_hidden_wdn_create
-            || ((render_spu.render_to_app_window || render_spu.render_to_crut_window) && !crGetenv("CRNEWSERVER")))
-        showIt = 0;
-    else
-        showIt = (id != CR_RENDER_DEFAULT_WINDOW_ID);
+    showIt = 0;
 
     /*
@@ -1233 +1229 @@
     switch (target)
     {
-        case GL_HOST_WND_CREATED_HIDDEN:
-            render_spu.force_hidden_wdn_create = value ? GL_TRUE : GL_FALSE;
-            break;
         default:
 //            crWarning("Unhandled target in renderspuChromiumParameteriCR()");

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -317 +317 @@
 # endif
 #endif /* RT_OS_DARWIN */
-
-    int force_hidden_wdn_create;
 } RenderSPU;