Changeset 47599 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

Timestamp:

Aug 7, 2013 6:02:07 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: more TexPresent fixes & saved state impl

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (5 diffs)

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

@@ -2701 +2701 @@
     if (pMI->screenId == *sIndex)
     {
-        crServerVBoxCompositionDisableEnter(pMI);
-
-        pMI->fHasParentWindow = !!cr_server.screen[pMI->screenId].winID;
-
-        renderspuReparentWindow(pMI->spuWindow);
-
-        crServerVBoxCompositionDisableLeave(pMI, GL_FALSE);
+        crServerWindowReparent(pMI);
     }
 }
@@ -2753 +2747 @@
     if (MAPPED(SCREEN(sIndex)))
     {
+        PCR_DISPLAY pDisplay = crServerDisplayGetInitialized(sIndex);
+
         SCREEN(sIndex).winID = 0;
         renderspuSetWindowId(0);
@@ -2759 +2755 @@
 
         crHashtableWalk(cr_server.dummyMuralTable, crVBoxServerReparentMuralCB, &sIndex);
+
+        if (pDisplay)
+            CrDpReparent(pDisplay, &SCREEN(sIndex));
     }
 
@@ -2831 +2830 @@
         PCR_DISPLAY pDisplay = crServerDisplayGetInitialized(sIndex);
         if (pDisplay)
-            CrDpResize(pDisplay, x, y, w, h);
+            CrDpReparent(pDisplay, &SCREEN(sIndex));
     }
 
@@ -3036 +3035 @@
 
         /* no need to do anything here actually */
+    }
+
+    if (fPosChanged || fSizeChanged)
+    {
+        PCR_DISPLAY pDisplay = crServerDisplayGetInitialized(sIndex);
+        if (pDisplay)
+            CrDpResize(pDisplay, SCREEN(sIndex).x, SCREEN(sIndex).y, SCREEN(sIndex).w, SCREEN(sIndex).h);
     }
     return VINF_SUCCESS;