Changeset 50178 in vbox

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: seamless and resize bugfixes

Location:

trunk

Files:

• include/VBox/HostServices/VBoxCrOpenGLSvc.h (modified) (2 diffs)
• src/VBox/GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/util/compositor.cpp (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/util/htable.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (11 diffs)
• src/VBox/Main/include/DisplayImpl.h (modified) (2 diffs)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (2 diffs)

trunk/include/VBox/HostServices/VBoxCrOpenGLSvc.h

@@ -32 +32 @@
 #include <VBox/VBoxGuest2.h>
 #include <VBox/hgcmsvc.h>
+#include <VBox/VBoxVideo.h>
 
 /* crOpenGL host functions */
@@ -361 +362 @@
 } CRVBOXHGCMWRITEREADBUFFERED;
 
+
+typedef struct
+{
+    VBVAINFOSCREEN Screen;
+    void *pvVRAM;
+} CRVBOXHGCMDEVRESIZE;
+
 #endif

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

@@ -531 +531 @@
 extern DECLEXPORT(void) crServerVBoxCompositionSetEnableStateGlobal(GLboolean fEnable);
 struct VBVAINFOSCREEN;
-extern DECLEXPORT(int) crVBoxServerNotifyResize(uint32_t idScreen);
+extern DECLEXPORT(int) crVBoxServerNotifyResize(const struct VBVAINFOSCREEN *pScreen, void *pvVRAM);
 extern DECLEXPORT(int32_t) crVBoxServerSetRootVisibleRegion(GLint cRects, const RTRECT *pRects);
 

trunk/src/VBox/GuestHost/OpenGL/util/compositor.cpp

@@ -409 +409 @@
         if (fAdjusted)
         {
-            fChangeFlags &= ~VBOXVR_COMPOSITOR_CF_ENTRY_REPLACED;
-            fChangeFlags |= VBOXVR_COMPOSITOR_CF_REGIONS_CHANGED | VBOXVR_COMPOSITOR_CF_ENTRY_REGIONS_CHANGED;
+            if (CrVrScrCompositorEntryIsUsed(pEntry))
+            {
+                fChangeFlags &= ~VBOXVR_COMPOSITOR_CF_ENTRY_REPLACED;
+                fChangeFlags |= VBOXVR_COMPOSITOR_CF_REGIONS_CHANGED | VBOXVR_COMPOSITOR_CF_ENTRY_REGIONS_CHANGED;
+            }
+            else
+            {
+                fChangeFlags = 0;
+            }
         }
     }

trunk/src/VBox/GuestHost/OpenGL/util/htable.cpp

@@ -95 +95 @@
     pTbl->cData = 0;
     pTbl->iNext2Search = 0;
+    if (pTbl->cSize)
+        memset(pTbl->paData, 0, sizeof (pTbl->paData[0]) * pTbl->cSize);
 }
 
@@ -159 +161 @@
     {
         void* pvData = pTbl->paData[iIndex];
-        pTbl->paData[iIndex] = NULL;
-        --pTbl->cData;
-        Assert(pTbl->cData <= pTbl->cSize);
-        pTbl->iNext2Search = iIndex;
+        if (pvData)
+        {
+            pTbl->paData[iIndex] = NULL;
+            --pTbl->cData;
+            Assert(pTbl->cData <= pTbl->cSize);
+            pTbl->iNext2Search = iIndex;
+        }
         return pvData;
     }
@@ -172 +177 @@
 {
     uint32_t iIndex = crHTableHandle2Index(hHandle);
-    Assert(iIndex < pTbl->cSize);
     if (iIndex < pTbl->cSize)
         return pTbl->paData[iIndex];
-    WARN(("invalid handle supplied %d", hHandle));
+    LOG(("invalid handle supplied %d", hHandle));
     return NULL;
 }

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;
         }

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -170 +170 @@
     void handleCrHgsmiControlCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam);
 #endif
+
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
+    void  handleCrAsyncCmdCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam);
+#endif
+
     int notifyCroglResize(const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM);
 
@@ -267 +272 @@
 #endif
 
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
+    static DECLCALLBACK(void)  displayCrAsyncCmdCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext);
+#endif
+
     static DECLCALLBACK(void)  displaySSMSaveScreenshot(PSSMHANDLE pSSM, void *pvUser);
     static DECLCALLBACK(int)   displaySSMLoadScreenshot(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPass);

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -670 +670 @@
             if (pVMMDev)
             {
-                VBOXHGCMSVCPARM parm[SHCRGL_CPARMS_DEV_RESIZE];
-
-                parm[0].type = VBOX_HGCM_SVC_PARM_32BIT;
-                parm[0].u.uint32 = pScreen->u32ViewIndex;
-
-                /* no completion callback is specified with this call,
-                 * the CrOgl code will complete the CrHgsmi command once it processes it */
-                rc = pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_DEV_RESIZE, parm, NULL, NULL);
-                AssertRC(rc);
+                CRVBOXHGCMDEVRESIZE *pData = (CRVBOXHGCMDEVRESIZE*)RTMemAlloc(sizeof (*pData));
+                if (pData)
+                {
+                    pData->Screen = *pScreen;
+                    pData->pvVRAM = pvVRAM;
+
+                    VBOXHGCMSVCPARM parm;
+
+                    parm.type = VBOX_HGCM_SVC_PARM_PTR;
+                    parm.u.pointer.addr = pData;
+                    parm.u.pointer.size = sizeof (*pData);
+
+                    rc = pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_DEV_RESIZE, &parm, displayCrAsyncCmdCompletion, this);
+                    AssertRC(rc);
+                }
+                else
+                    rc = VERR_NO_MEMORY;
             }
         }
@@ -4062 +4070 @@
     pDisplay->handleCrHgsmiControlCompletion(result, u32Function, pParam);
 }
+#endif
+
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
+DECLCALLBACK(void)  Display::displayCrAsyncCmdCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext)
+{
+    Display *pDisplay = (Display *)pvContext;
+    pDisplay->handleCrAsyncCmdCompletion(result, u32Function, pParam);
+}
+
+
+void  Display::handleCrAsyncCmdCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam)
+{
+    if (pParam->type == VBOX_HGCM_SVC_PARM_PTR && pParam->u.pointer.addr)
+        RTMemFree(pParam->u.pointer.addr);
+}
+
 #endif