儲存庫 vbox 的更動 50137

時間撮記:

2014-1-21 上午10:23:54 (11 年 以前)

作者:

vboxsync

訊息:

crOpenGL: bugfixes

檔案:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (修改) (8 筆差異)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -276 +276 @@
 
 #define CR_PMGR_MODE_WINDOW 0x1
-/* CR_PMGR_MODE_WINDOW gets automatically set with it */
+/* mutually exclusive with CR_PMGR_MODE_WINDOW */
 #define CR_PMGR_MODE_ROOTVR 0x2
 #define CR_PMGR_MODE_VRDP   0x4
@@ -516 +516 @@
     CrVrScrCompositorEntryFlagsSet(&pEntry->Entry, fFlags);
     pEntry->cRefs = 1;
+    pEntry->Flags.Value = 0;
     CrHTableCreate(&pEntry->HTable, 0);
 
@@ -959 +960 @@
         {
             HCR_FRAMEBUFFER_ENTRY hEntry = CrFbEntryFromCompositorEntry(pEntry);
+            rc = EntryCreated(mpFb, hEntry);
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+                break;
+            }
+
             rc = EntryAdded(mpFb, hEntry);
             if (!RT_SUCCESS(rc))
             {
                 WARN(("err"));
+                EntryDestroyed(mpFb, hEntry);
                 break;
             }
@@ -1405 +1414 @@
         }
 
+        uint64_t oldParentId = mParentId;
+
         mParentId = parentId;
 
-        if (!parentId)
-            cr_server.head_spu->dispatch_table.WindowShow(mSpuWindow, false);
-
         if (mSpuWindow)
         {
+            if (oldParentId && !parentId && mFlags.fVisible)
+                cr_server.head_spu->dispatch_table.WindowShow(mSpuWindow, false);
+
             renderspuSetWindowId(mParentId);
             renderspuReparentWindow(mSpuWindow);
             renderspuSetWindowId(cr_server.screen[0].winID);
+
+            if (parentId)
+                cr_server.head_spu->dispatch_table.WindowPosition(mSpuWindow, mxPos, myPos);
+
+            if (!oldParentId && parentId && mFlags.fVisible)
+                cr_server.head_spu->dispatch_table.WindowShow(mSpuWindow, true);
         }
 
@@ -2928 +2945 @@
     u32Mode = CR_PMGR_MODE_ALL & u32Mode;
     if (CR_PMGR_MODE_ROOTVR & u32Mode)
-        u32Mode |= CR_PMGR_MODE_WINDOW;
+        u32Mode &= ~CR_PMGR_MODE_WINDOW;
     return u32Mode;
 }
@@ -3000 +3017 @@
 
     CR_FBDISPLAY_INFO *pInfo = &g_CrPresenter.aDisplayInfos[idScreen];
-    u32ModeRemove = crPMgrModeAdjustVal(u32ModeRemove);
+    u32ModeRemove = ((u32ModeRemove | crPMgrModeAdjustVal(u32ModeRemove)) & CR_PMGR_MODE_ALL);
     u32ModeAdd = crPMgrModeAdjustVal(u32ModeAdd);
     u32ModeRemove &= pInfo->u32Mode;
     u32ModeAdd &= ~(u32ModeRemove | pInfo->u32Mode);
+    uint32_t u32ModeResulting = ((pInfo->u32Mode | u32ModeAdd) & ~u32ModeRemove);
+    uint32_t u32Tmp = crPMgrModeAdjustVal(u32ModeResulting);
+    if (u32Tmp != u32ModeResulting)
+    {
+        u32ModeAdd |= (u32Tmp & ~u32ModeResulting);
+        u32ModeRemove |= (~u32Tmp & u32ModeResulting);
+        u32ModeResulting = u32Tmp;
+        Assert(u32ModeResulting == ((pInfo->u32Mode | u32ModeAdd) & ~u32ModeRemove));
+    }
     if (!u32ModeRemove && !u32ModeAdd)
         return VINF_SUCCESS;
@@ -3025 +3051 @@
         pInfo->pDpWinRootVr = NULL;
         pInfo->pDpWin = NULL;
-
-        if (!(u32ModeRemove & CR_PMGR_MODE_WINDOW))
-        {
-            /* ensure the window is re-created */
-            u32ModeAdd |= CR_PMGR_MODE_WINDOW;
-        }
     }
     else if (u32ModeRemove & CR_PMGR_MODE_WINDOW)
@@ -3107 +3127 @@
         delete pOldWin;
 
-    pInfo->u32Mode = ((pInfo->u32Mode | u32ModeAdd) & ~u32ModeRemove);
+    pInfo->u32Mode = u32ModeResulting;
 
     return VINF_SUCCESS;