Changeset 52429 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Aug 20, 2014 11:58:38 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95613

Message:

crOpenGL: 1. osx: do everything we can do in the main thread 2. bugfixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_main.c (modified) (3 diffs)
• server_presenter.cpp (modified) (46 diffs)
• server_window.c (modified) (3 diffs)

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

@@ -282 +282 @@
 
     VBoxVrTerm();
+
+    RTSemEventDestroy(cr_server.hCalloutCompletionEvent);
 }
 
@@ -513 +515 @@
 
     cr_server.pCleanupClient = NULL;
+
+    rc = RTSemEventCreate(&cr_server.hCalloutCompletionEvent);
+    if (!RT_SUCCESS(rc))
+    {
+        WARN(("RTSemEventCreate failed %d", rc));
+        return GL_FALSE;
+    }
 
     /*
@@ -4232 +4241 @@
             g_pLed = pSetup->pLed;
 
+            cr_server.ClientInfo = pSetup->CrClientInfo;
+
             pSetup->CrCmdServerInfo.hSvr = NULL;
             pSetup->CrCmdServerInfo.pfnEnable = crVBoxCrCmdEnable;

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

@@ -46 +46 @@
 #include "render/renderspu.h"
 
+//#define CR_SERVER_WITH_CLIENT_CALLOUTS
+
 class ICrFbDisplay
 {
@@ -72 +74 @@
 class CrFbDisplayWindowRootVr;
 class CrFbDisplayVrdp;
+class CrFbWindow;
 
 typedef struct CR_FRAMEBUFFER
@@ -126 +129 @@
     CrFbDisplayWindowRootVr *pDpWinRootVr;
     CrFbDisplayVrdp *pDpVrdp;
+    CrFbWindow *pWindow;
+    uint32_t u32DisplayMode;
     uint32_t u32Id;
     int32_t iFb;
@@ -152 +157 @@
 } CR_PRESENTER_GLOBALS;
 
+static int crPMgrFbConnectTargetDisplays(HCR_FRAMEBUFFER hFb, CR_FBDISPLAY_INFO *pDpInfo, uint32_t u32ModeAdd);
+
 static CR_PRESENTER_GLOBALS g_CrPresenter;
 
@@ -2656 +2663 @@
     virtual int UpdateBegin(struct CR_FRAMEBUFFER *pFb)
     {
-        int rc = mpWindow->UpdateBegin();
+        int rc = mpWindow ? mpWindow->UpdateBegin() : VINF_SUCCESS;
         if (RT_SUCCESS(rc))
         {
@@ -2663 +2670 @@
                 return VINF_SUCCESS;
             else
+            {
                 WARN(("err"));
+                if (mpWindow)
+                    mpWindow->UpdateEnd();
+            }
         }
         else
@@ -2675 +2686 @@
         CrFbDisplayBase::UpdateEnd(pFb);
 
-        mpWindow->UpdateEnd();
+        if (mpWindow)
+            mpWindow->UpdateEnd();
     }
 
@@ -2687 +2699 @@
         }
 
-        if (mpWindow->GetParentId())
+        if (mpWindow && mpWindow->GetParentId())
         {
             rc = mpWindow->Create();
@@ -2709 +2721 @@
         }
 
-        if (mpWindow->GetParentId())
+        if (mpWindow && mpWindow->GetParentId())
         {
             rc = mpWindow->Create();
@@ -2731 +2743 @@
         }
 
-        if (mpWindow->GetParentId())
+        if (mpWindow && mpWindow->GetParentId())
         {
             rc = mpWindow->Create();
@@ -2753 +2765 @@
         }
 
-        if (mpWindow->GetParentId())
+        if (mpWindow && mpWindow->GetParentId())
         {
             rc = mpWindow->Create();
@@ -2793 +2805 @@
 // always call SetPosition to ensure window is adjustep properly
 //        if (pViewportRect->xLeft != mViewportRect.xLeft || pViewportRect->yTop != mViewportRect.yTop)
+        if (mpWindow)
         {
             const RTRECT* pRect = getRect();
@@ -2808 +2821 @@
     }
 
-    virtual CrFbWindow * windowDetach()
+    virtual CrFbWindow * windowDetach(bool fCleanup = true)
     {
         if (isUpdating())
@@ -2819 +2832 @@
         if (mpWindow)
         {
-            windowCleanup();
+            if (fCleanup)
+                windowCleanup();
             mpWindow = NULL;
         }
@@ -2848 +2862 @@
         mDefaultParentId = parentId;
 
-        if (!isActive())
+        if (!isActive() && mpWindow)
         {
             int rc = mpWindow->Reparent(parentId);
@@ -2872 +2886 @@
         int rc = VINF_SUCCESS;
 
-        if (isActive())
+        if (isActive() && mpWindow)
         {
             rc = mpWindow->Reparent(parentId);
@@ -2898 +2912 @@
         if (!hFb || !CrFbIsEnabled(hFb))
         {
-            Assert(!mpWindow->IsVisivle());
+            Assert(!mpWindow || !mpWindow->IsVisivle());
             return VINF_SUCCESS;
         }
 
-        int rc = mpWindow->UpdateBegin();
-        if (RT_SUCCESS(rc))
-        {
-            rc = mpWindow->SetVisible(!g_CrPresenter.fWindowsForceHidden);
-            if (!RT_SUCCESS(rc))
-                WARN(("SetVisible failed, rc %d", rc));
-
-            mpWindow->UpdateEnd();
-        }
-        else
-            WARN(("UpdateBegin failed, rc %d", rc));
+        int rc = VINF_SUCCESS;
+
+        if (mpWindow)
+        {
+            rc = mpWindow->UpdateBegin();
+            if (RT_SUCCESS(rc))
+            {
+                rc = mpWindow->SetVisible(!g_CrPresenter.fWindowsForceHidden);
+                if (!RT_SUCCESS(rc))
+                    WARN(("SetVisible failed, rc %d", rc));
+
+                mpWindow->UpdateEnd();
+            }
+            else
+                WARN(("UpdateBegin failed, rc %d", rc));
+        }
 
         return rc;
     }
 
+    CrFbWindow* getWindow() {return mpWindow;}
 protected:
     virtual void onUpdateEnd()
@@ -2932 +2952 @@
     virtual void ueRegions()
     {
-        mpWindow->SetVisibleRegionsChanged();
+        if (mpWindow)
+            mpWindow->SetVisibleRegionsChanged();
     }
 
@@ -2955 +2976 @@
     virtual int windowSetCompositor(bool fSet)
     {
+        if (!mpWindow)
+            return VINF_SUCCESS;
+
         if (fSet)
         {
@@ -2965 +2989 @@
     virtual int windowCleanup()
     {
+        if (!mpWindow)
+            return VINF_SUCCESS;
+
         int rc = mpWindow->UpdateBegin();
         if (!RT_SUCCESS(rc))
@@ -3013 +3040 @@
     {
         int rc = VINF_SUCCESS;
+
+        if (!mpWindow)
+            return VINF_SUCCESS;
 
 //        HCR_FRAMEBUFFER hFb = getFramebuffer();
@@ -3061 +3091 @@
             }
 
+#if 0
             rc = mpWindow->Reparent(mDefaultParentId);
             if (!RT_SUCCESS(rc))
@@ -3067 +3098 @@
                 return rc;
             }
+#endif
         }
 
@@ -3074 +3106 @@
     virtual int windowSync()
     {
+        if (!mpWindow)
+            return VINF_SUCCESS;
+
         int rc = mpWindow->UpdateBegin();
         if (!RT_SUCCESS(rc))
@@ -3124 +3159 @@
         if (CrFbHas3DData(hFb))
         {
-            if (mpWindow->GetParentId())
+            if (mpWindow && mpWindow->GetParentId())
             {
                 rc = mpWindow->Create();
@@ -3144 +3179 @@
     }
 
-    CrFbWindow* getWindow() {return mpWindow;}
 private:
     CrFbWindow *mpWindow;
@@ -4166 +4200 @@
 }
 
+static int crPMgrCheckInitWindowDisplays(uint32_t idScreen)
+{
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+    CR_FBDISPLAY_INFO *pDpInfo = &g_CrPresenter.aDisplayInfos[idScreen];
+    if (pDpInfo->iFb >= 0)
+    {
+        uint32_t u32ModeAdd = g_CrPresenter.u32DisplayMode & (CR_PMGR_MODE_WINDOW | CR_PMGR_MODE_ROOTVR);
+        int rc = crPMgrFbConnectTargetDisplays(&g_CrPresenter.aFramebuffers[pDpInfo->iFb], pDpInfo, u32ModeAdd);
+        if (RT_FAILURE(rc))
+        {
+            WARN(("crPMgrFbConnectTargetDisplays failed %d", rc));
+            return rc;
+        }
+    }
+#endif
+    return VINF_SUCCESS;
+}
+
 int CrPMgrScreenChanged(uint32_t idScreen)
 {
@@ -4176 +4228 @@
     int rc = VINF_SUCCESS;
     CR_FBDISPLAY_INFO *pDpInfo;
+#if 0
     bool fDefaultParentChange = (idScreen == 0);
     if (fDefaultParentChange)
@@ -4217 +4270 @@
         }
     }
+#endif
 
     pDpInfo = &g_CrPresenter.aDisplayInfos[idScreen];
+
+    HCR_FRAMEBUFFER hFb = pDpInfo->iFb >= 0 ? CrPMgrFbGet(pDpInfo->iFb) : NULL;
+    if (hFb && CrFbIsUpdating(hFb))
+    {
+        WARN(("trying to update viewport while framebuffer is being updated"));
+        rc = VERR_INVALID_STATE;
+        goto end;
+    }
+
     if (pDpInfo->pDpWin)
     {
-        HCR_FRAMEBUFFER hFb = pDpInfo->iFb >= 0 ? CrPMgrFbGet(pDpInfo->iFb) : NULL;
-        if (hFb && CrFbIsUpdating(hFb))
-        {
-            WARN(("trying to update viewport while framebuffer is being updated"));
-            rc = VERR_INVALID_STATE;
-            goto end;
-        }
+        CRASSERT(pDpInfo->pDpWin->getWindow());
 
         rc = pDpInfo->pDpWin->UpdateBegin(hFb);
@@ -4239 +4296 @@
             WARN(("UpdateBegin failed %d", rc));
     }
-
+    else
+    {
+        if (pDpInfo->pWindow)
+        {
+            rc = pDpInfo->pWindow->UpdateBegin();
+            if (RT_FAILURE(rc))
+            {
+                WARN(("UpdateBegin failed %d", rc));
+                goto end;
+            }
+
+            rc = pDpInfo->pWindow->SetVisible(false);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("SetVisible failed %d", rc));
+                pDpInfo->pWindow->UpdateEnd();
+                goto end;
+            }
+
+            rc = pDpInfo->pWindow->Reparent(cr_server.screen[idScreen].winID);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("Reparent failed %d", rc));
+                pDpInfo->pWindow->UpdateEnd();
+                goto end;
+            }
+
+            pDpInfo->pWindow->UpdateEnd();
+        }
+
+        rc = crPMgrCheckInitWindowDisplays(idScreen);
+        if (RT_FAILURE(rc))
+        {
+            WARN(("crPMgrFbConnectTargetDisplays failed %d", rc));
+            goto end;
+        }
+    }
 end:
-
+#if 0
     if (fDefaultParentChange)
     {
@@ -4254 +4347 @@
         }
     }
-
+#endif
     return rc;
 }
@@ -4276 +4369 @@
         }
 
-        int rc = pDpInfo->pDpWin->UpdateBegin(hFb);
-        if (RT_SUCCESS(rc))
-        {
-            pDpInfo->pDpWin->setViewportRect(&cr_server.screenVieport[idScreen].Rect);
-            pDpInfo->pDpWin->UpdateEnd(hFb);
-        }
-        else
-            WARN(("UpdateBegin failed %d", rc));
+        if (pDpInfo->pDpWin)
+        {
+            CRASSERT(pDpInfo->pDpWin->getWindow());
+            int rc = pDpInfo->pDpWin->UpdateBegin(hFb);
+            if (RT_SUCCESS(rc))
+            {
+                pDpInfo->pDpWin->setViewportRect(&cr_server.screenVieport[idScreen].Rect);
+                pDpInfo->pDpWin->UpdateEnd(hFb);
+            }
+            else
+                WARN(("UpdateBegin failed %d", rc));
+        }
     }
 
@@ -4399 +4496 @@
     if (pDpInfo->pDpWinRootVr)
     {
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+        CrFbWindow *pWindow = pDpInfo->pDpWinRootVr->windowDetach(false);
+        Assert(pWindow == pDpInfo->pWindow);
+#endif
         rc = crPMgrFbDisconnectDisplay(hFb, pDpInfo->pDpWinRootVr);
         if (RT_FAILURE(rc))
@@ -4406 +4507 @@
         }
     }
-
-    if (pDpInfo->pDpWin)
-    {
+    else if (pDpInfo->pDpWin)
+    {
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+        CrFbWindow *pWindow = pDpInfo->pDpWin->windowDetach(false);
+        Assert(pWindow == pDpInfo->pWindow);
+#endif
         rc = crPMgrFbDisconnectDisplay(hFb, pDpInfo->pDpWin);
         if (RT_FAILURE(rc))
@@ -4427 +4531 @@
     if (!pDpInfo->pDpWinRootVr)
     {
-        CrFbWindow *pWin = NULL;
         if (pDpInfo->pDpWin)
         {
-            pWin = pDpInfo->pDpWin->windowDetach();
+            CrFbWindow *pWin = pDpInfo->pDpWin->windowDetach();
             CRASSERT(pWin);
+            Assert(pWin == pDpInfo->pWindow);
             delete pDpInfo->pDpWin;
             pDpInfo->pDpWin = NULL;
         }
-        else
-            pWin = new CrFbWindow(0);
-
-        pDpInfo->pDpWinRootVr = new CrFbDisplayWindowRootVr(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID, cr_server.screen[0].winID);
+        else if (!pDpInfo->pWindow)
+        {
+            pDpInfo->pWindow = new CrFbWindow(0);
+        }
+
+        pDpInfo->pDpWinRootVr = new CrFbDisplayWindowRootVr(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID, /*cr_server.screen[0].winID*/ 0);
         pDpInfo->pDpWin = pDpInfo->pDpWinRootVr;
-        pDpInfo->pDpWinRootVr->windowAttach(pWin);
+        pDpInfo->pDpWinRootVr->windowAttach(pDpInfo->pWindow);
     }
 }
@@ -4446 +4552 @@
 static void crPMgrDpWinCreate(CR_FBDISPLAY_INFO *pDpInfo)
 {
-    CrFbWindow *pWin = NULL;
     if (pDpInfo->pDpWinRootVr)
     {
         CRASSERT(pDpInfo->pDpWinRootVr == pDpInfo->pDpWin);
-        pWin = pDpInfo->pDpWin->windowDetach();
+        CrFbWindow *pWin = pDpInfo->pDpWin->windowDetach();
         CRASSERT(pWin);
+        Assert(pWin == pDpInfo->pWindow);
         delete pDpInfo->pDpWinRootVr;
         pDpInfo->pDpWinRootVr = NULL;
@@ -4459 +4565 @@
     if (!pDpInfo->pDpWin)
     {
-        if (!pWin)
-            pWin = new CrFbWindow(0);
-
-        pDpInfo->pDpWin = new CrFbDisplayWindow(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID, cr_server.screen[0].winID);
-        pDpInfo->pDpWin->windowAttach(pWin);
+        if (!pDpInfo->pWindow)
+            pDpInfo->pWindow = new CrFbWindow(0);
+
+        pDpInfo->pDpWin = new CrFbDisplayWindow(&cr_server.screenVieport[pDpInfo->u32Id].Rect, cr_server.screen[pDpInfo->u32Id].winID, /*cr_server.screen[0].winID*/ 0);
+        pDpInfo->pDpWin->windowAttach(pDpInfo->pWindow);
     }
 }
@@ -4472 +4578 @@
     if (u32ModeRemove & CR_PMGR_MODE_ROOTVR)
     {
-        CRASSERT(pDpInfo->pDpWinRootVr);
-        CRASSERT(pDpInfo->pDpWin == pDpInfo->pDpWinRootVr);
-        rc = crPMgrFbDisconnectDisplay(hFb, pDpInfo->pDpWinRootVr);
-        if (RT_FAILURE(rc))
-        {
-            WARN(("crPMgrFbDisconnectDisplay pDpWinRootVr failed %d", rc));
-            return rc;
+        if (pDpInfo->pDpWinRootVr)
+        {
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+            CrFbWindow *pWindow = pDpInfo->pDpWinRootVr->windowDetach(false);
+            Assert(pWindow == pDpInfo->pWindow);
+#endif
+            CRASSERT(pDpInfo->pDpWin == pDpInfo->pDpWinRootVr);
+            rc = crPMgrFbDisconnectDisplay(hFb, pDpInfo->pDpWinRootVr);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("crPMgrFbDisconnectDisplay pDpWinRootVr failed %d", rc));
+                return rc;
+            }
         }
     }
@@ -4484 +4596 @@
     {
         CRASSERT(!pDpInfo->pDpWinRootVr);
-        CRASSERT(pDpInfo->pDpWin);
-        rc = crPMgrFbDisconnectDisplay(hFb, pDpInfo->pDpWin);
-        if (RT_FAILURE(rc))
-        {
-            WARN(("crPMgrFbDisconnectDisplay pDpWin failed %d", rc));
-            return rc;
+        if (pDpInfo->pDpWin)
+        {
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+            CrFbWindow *pWindow = pDpInfo->pDpWin->windowDetach(false);
+            Assert(pWindow == pDpInfo->pWindow);
+#endif
+            rc = crPMgrFbDisconnectDisplay(hFb, pDpInfo->pDpWin);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("crPMgrFbDisconnectDisplay pDpWin failed %d", rc));
+                return rc;
+            }
         }
     }
@@ -4495 +4613 @@
     if (u32ModeRemove & CR_PMGR_MODE_VRDP)
     {
-        CRASSERT(pDpInfo->pDpVrdp);
-        rc = crPMgrFbDisconnectDisplay(hFb, pDpInfo->pDpVrdp);
-        if (RT_FAILURE(rc))
-        {
-            WARN(("crPMgrFbDisconnectDisplay pDpVrdp failed %d", rc));
-            return rc;
-        }
-    }
+        if (pDpInfo->pDpVrdp)
+        {
+            rc = crPMgrFbDisconnectDisplay(hFb, pDpInfo->pDpVrdp);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("crPMgrFbDisconnectDisplay pDpVrdp failed %d", rc));
+                return rc;
+            }
+        }
+    }
+
+    pDpInfo->u32DisplayMode &= ~u32ModeRemove;
 
     return VINF_SUCCESS;
@@ -4546 +4668 @@
         }
     }
+
+    pDpInfo->u32DisplayMode |= u32ModeAdd;
 
     return VINF_SUCCESS;
@@ -4579 +4703 @@
     }
 
-    rc = crPMgrFbConnectTargetDisplays(hFb, pDpInfo, g_CrPresenter.u32DisplayMode);
+    rc = crPMgrFbConnectTargetDisplays(hFb, pDpInfo, g_CrPresenter.u32DisplayMode
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+            & ~(CR_PMGR_MODE_WINDOW | CR_PMGR_MODE_ROOTVR)
+#endif
+            );
     if (RT_FAILURE(rc))
     {
@@ -4678 +4806 @@
             if (!pDpInfo->pDpWinRootVr->getFramebuffer())
             {
+                pDpInfo->pDpWinRootVr->windowDetach(false);
                 delete pDpInfo->pDpWinRootVr;
                 pDpInfo->pDpWinRootVr = NULL;
                 pDpInfo->pDpWin = NULL;
+                if (pDpInfo->pWindow)
+                {
+                    delete pDpInfo->pWindow;
+                    pDpInfo->pWindow = NULL;
+                }
             }
             else
@@ -4689 +4823 @@
             if (!pDpInfo->pDpWin->getFramebuffer())
             {
+                pDpInfo->pDpWin->windowDetach(false);
                 delete pDpInfo->pDpWin;
                 pDpInfo->pDpWin = NULL;
+                if (pDpInfo->pWindow)
+                {
+                    delete pDpInfo->pWindow;
+                    pDpInfo->pWindow = NULL;
+                }
             }
             else
@@ -4981 +5121 @@
     if (fFbInfoChanged)
     {
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+        rc = crPMgrModeModify(hFb, 0, CR_PMGR_MODE_WINDOW | CR_PMGR_MODE_ROOTVR);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("crPMgrModeModifyTarget failed %d", rc));
+            return rc;
+        }
+#endif
         rc = CrFbUpdateBegin(hFb);
         if (!RT_SUCCESS(rc))
@@ -6206 +6354 @@
     return 0;
 }
+
+typedef struct CRSERVER_CLIENT_CALLOUT
+{
+    VBOXCRCMDCTL_CALLOUT_LISTENTRY Entry;
+    PFNVCRSERVER_CLIENT_CALLOUT_CB pfnCb;
+    void*pvCb;
+} CRSERVER_CLIENT_CALLOUT;
+
+static DECLCALLBACK(void) crServerClientCalloutCb(struct VBOXCRCMDCTL_CALLOUT_LISTENTRY *pEntry)
+{
+    CRSERVER_CLIENT_CALLOUT *pCallout = RT_FROM_MEMBER(pEntry, CRSERVER_CLIENT_CALLOUT, Entry);
+    pCallout->pfnCb(pCallout->pvCb);
+    int rc = RTSemEventSignal(cr_server.hCalloutCompletionEvent);
+    if (RT_FAILURE(rc))
+        WARN(("RTSemEventSignal failed rc %d", rc));
+}
+
+static DECLCALLBACK(void) crServerClientCallout(PFNVCRSERVER_CLIENT_CALLOUT_CB pfnCb, void*pvCb)
+{
+    Assert(cr_server.pCurrentCalloutCtl);
+    CRSERVER_CLIENT_CALLOUT Callout;
+    Callout.pfnCb = pfnCb;
+    Callout.pvCb = pvCb;
+    cr_server.ClientInfo.pfnCallout(cr_server.ClientInfo.hClient, cr_server.pCurrentCalloutCtl, &Callout.Entry, crServerClientCalloutCb);
+
+    int rc = RTSemEventWait(cr_server.hCalloutCompletionEvent, RT_INDEFINITE_WAIT);
+    if (RT_FAILURE(rc))
+        WARN(("RTSemEventWait failed %d", rc));
+}
+
+
+DECLEXPORT(void) crVBoxServerCalloutEnable(VBOXCRCMDCTL *pCtl)
+{
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+    Assert(!cr_server.pCurrentCalloutCtl);
+    cr_server.pCurrentCalloutCtl = pCtl;
+
+    cr_server.head_spu->dispatch_table.ChromiumParametervCR(GL_HH_SET_CLIENT_CALLOUT, 0, 0, (void*)crServerClientCallout);
+#endif
+}
+
+extern DECLEXPORT(void) crVBoxServerCalloutDisable()
+{
+#ifdef CR_SERVER_WITH_CLIENT_CALLOUTS
+    Assert(cr_server.pCurrentCalloutCtl);
+
+    cr_server.head_spu->dispatch_table.ChromiumParametervCR(GL_HH_SET_CLIENT_CALLOUT, 0, 0, NULL);
+
+    cr_server.pCurrentCalloutCtl = NULL;
+#endif
+}

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

@@ -36 +36 @@
     if (fGuestWindow)
     {
-        CRMuralInfo *dummy = crServerGetDummyMural(visBits);
+        CRMuralInfo *dummy = crServerGetDummyMural(realVisBits);
         if (!dummy)
         {
@@ -44 +44 @@
         spuWindow = dummy->spuWindow;
         mural->fIsDummyRefference = GL_TRUE;
+
+        dims[0] = dummy->width;
+        dims[1] = dummy->height;
     }
     else
@@ -56 +59 @@
         }
         mural->fIsDummyRefference = GL_FALSE;
-    }
-
-    /* get initial window size */
-    cr_server.head_spu->dispatch_table.GetChromiumParametervCR(GL_WINDOW_SIZE_CR, spuWindow, GL_INT, 2, dims);
+
+        /* get initial window size */
+        cr_server.head_spu->dispatch_table.GetChromiumParametervCR(GL_WINDOW_SIZE_CR, spuWindow, GL_INT, 2, dims);
+    }
 
     defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, 0);