Changeset 50178 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jan 23, 2014 12:04:44 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: seamless and resize bugfixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (1 diff)
• crserverlib/server_muralfbo.cpp (modified) (1 diff)
• crserverlib/server_presenter.cpp (modified) (11 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -1186 +1186 @@
             }
 
-            for (int i = 0; i < SHCRGL_CPARMS_DEV_RESIZE; ++i)
-            {
-                if (paParms[i].type != VBOX_HGCM_SVC_PARM_32BIT)
-                {
-                    AssertMsgFailed(("invalid param\n"));
-                    return VERR_INVALID_PARAMETER;
-                }
-            }
-
-            rc = crVBoxServerNotifyResize(paParms[0].u.uint32);
+            if (paParms->type != VBOX_HGCM_SVC_PARM_PTR)
+            {
+                AssertMsgFailed(("invalid param\n"));
+                return VERR_INVALID_PARAMETER;
+            }
+
+            if (!paParms->u.pointer.addr)
+            {
+                AssertMsgFailed(("invalid param\n"));
+                return VERR_INVALID_PARAMETER;
+            }
+
+            if (paParms->u.pointer.size != sizeof (CRVBOXHGCMDEVRESIZE))
+            {
+                AssertMsgFailed(("invalid param\n"));
+                return VERR_INVALID_PARAMETER;
+            }
+
+            CRVBOXHGCMDEVRESIZE *pResize = (CRVBOXHGCMDEVRESIZE*)paParms->u.pointer.addr;
+
+            rc = crVBoxServerNotifyResize(&pResize->Screen, pResize->pvVRAM);
             break;
         }

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

@@ -430 +430 @@
 }
 
-DECLEXPORT(int) crVBoxServerNotifyResize(uint32_t idScreen)
-{
-    struct VBVAINFOSCREEN Screen;
-    void *pvVRAM;
-
-    int rc = cr_server.CltInfo.pfnDmGet(cr_server.CltInfo.hClient, idScreen, &Screen, &pvVRAM);
-    if (!RT_SUCCESS(rc))
-    {
-        WARN(("err"));
-        return rc;
-    }
-
-    rc = crVBoxServerResizeScreen(&Screen, pvVRAM);
+DECLEXPORT(int) crVBoxServerNotifyResize(const struct VBVAINFOSCREEN *pScreen, void *pvVRAM)
+{
+    int rc = crVBoxServerResizeScreen(pScreen, pvVRAM);
     if (!RT_SUCCESS(rc))
     {

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

@@ -248 +248 @@
         return VINF_SUCCESS;
 
-    CrHTableEmpty(&pFb->SlotTable);
-
     pFb->pDisplay = pDisplay;
 
@@ -288 +286 @@
 #define CR_PMGR_MODE_ALL    0x7
 
-static int crPMgrModeModifyGlobal(uint32_t u32Mode, bool fEnable);
+static int crPMgrModeModifyGlobal(uint32_t u32ModeAdd, uint32_t u32ModeRemove);
 
 static CR_FBTEX* crFbTexAlloc()
@@ -412 +410 @@
     if (!pTobj)
     {
-        WARN(("pTobj is null!"));
+        LOG(("pTobj is null!"));
         crStateGlobalSharedRelease();
         return NULL;
@@ -573 +571 @@
     if (!pFbTex)
     {
-        WARN(("crFbTexAcquire failed"));
+        LOG(("crFbTexAcquire failed"));
         return VERR_INVALID_PARAMETER;
     }
@@ -1008 +1006 @@
         {
             mFlags.fRegionsShanged = 0;
-            ueRegions();
+            if (getFramebuffer()) /*<-dont't do anything on cleanup*/
+                ueRegions();
         }
     }
@@ -2243 +2242 @@
     {
         CrVrScrCompositorClear(&mCompositor);
+
         int rc = CrVrScrCompositorRectSet(&mCompositor, CrVrScrCompositorRectGet(CrFbGetCompositor(getFramebuffer())), NULL);
         if (!RT_SUCCESS(rc))
@@ -2833 +2833 @@
                 {
 #endif
-                    rc = crPMgrModeModifyGlobal(CR_PMGR_MODE_WINDOW, true);
+                    rc = crPMgrModeModifyGlobal(CR_PMGR_MODE_WINDOW, 0);
                     if (RT_SUCCESS(rc))
                         return VINF_SUCCESS;
@@ -2865 +2865 @@
 void CrPMgrTerm()
 {
-    crPMgrModeModifyGlobal(CR_PMGR_MODE_ALL, false);
+    crPMgrModeModifyGlobal(0, CR_PMGR_MODE_ALL);
 
     HCR_FRAMEBUFFER hFb;
@@ -3185 +3185 @@
 }
 
-static int crPMgrModeModifyGlobal(uint32_t u32Mode, bool fEnable)
-{
-    uint32_t u32ModeAdd, u32ModeRemove;
-    if (fEnable)
-    {
-        u32ModeAdd = u32Mode;
-        u32ModeRemove = 0;
-    }
-    else
-    {
-        u32ModeAdd = 0;
-        u32ModeRemove = u32Mode;
-    }
-
+static int crPMgrModeModifyGlobal(uint32_t u32ModeAdd, uint32_t u32ModeRemove)
+{
     g_CrPresenter.u32DisplayMode = (g_CrPresenter.u32DisplayMode | u32ModeAdd) & ~u32ModeRemove;
 
@@ -3213 +3201 @@
 int CrPMgrModeVrdp(bool fEnable)
 {
-    return crPMgrModeModifyGlobal(CR_PMGR_MODE_VRDP, fEnable);
+    uint32_t u32ModeAdd, u32ModeRemove;
+    if (fEnable)
+    {
+        u32ModeAdd = CR_PMGR_MODE_VRDP;
+        u32ModeRemove = 0;
+    }
+    else
+    {
+        u32ModeAdd = 0;
+        u32ModeRemove = CR_PMGR_MODE_VRDP;
+    }
+    return crPMgrModeModifyGlobal(u32ModeAdd, u32ModeRemove);
 }
 
 int CrPMgrModeRootVr(bool fEnable)
 {
-    return crPMgrModeModifyGlobal(CR_PMGR_MODE_ROOTVR, fEnable);
+    uint32_t u32ModeAdd, u32ModeRemove;
+    if (fEnable)
+    {
+        u32ModeAdd = CR_PMGR_MODE_ROOTVR;
+        u32ModeRemove = CR_PMGR_MODE_WINDOW;
+    }
+    else
+    {
+        u32ModeAdd = CR_PMGR_MODE_WINDOW;
+        u32ModeRemove = CR_PMGR_MODE_ROOTVR;
+    }
+
+    return crPMgrModeModifyGlobal(u32ModeAdd, u32ModeRemove);
 }
 
@@ -3677 +3688 @@
         if (!RT_SUCCESS(rc))
         {
-            WARN(("CrFbEntryCreateForTexId Failed"));
+            LOG(("CrFbEntryCreateForTexId Failed"));
             return;
         }