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

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: more TexPresent fixes & saved state impl

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (3 diffs)
• server_main.c (modified) (5 diffs)
• server_muralfbo.c (modified) (2 diffs)
• server_presenter.cpp (modified) (11 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -115 +115 @@
 GLint crServerMuralInit(CRMuralInfo *mural, const char *dpyName, GLint visBits, GLint preloadWinID, GLboolean fUseDefaultDEntry);
 void crServerMuralTerm(CRMuralInfo *mural);
-void crServerMuralSize(CRMuralInfo *mural, GLint width, GLint height);
-void crServerMutalPosition(CRMuralInfo *mural, GLint x, GLint y);
+GLboolean crServerMuralSize(CRMuralInfo *mural, GLint width, GLint height);
+void crServerMuralPosition(CRMuralInfo *mural, GLint x, GLint y, GLboolean fSkipCheckGeometry);
 void crServerMuralVisibleRegion( CRMuralInfo *mural, GLint cRects, const GLint *pRects );
 void crServerMuralShow( CRMuralInfo *mural, GLint state );
@@ -141 +141 @@
 void crServerWindowShow(CRMuralInfo *pMural);
 void crServerWindowVisibleRegion(CRMuralInfo *pMural);
+void crServerWindowReparent(CRMuralInfo *pMural);
 
 void crServerWindowSetIsVisible(CRMuralInfo *pMural, GLboolean fIsVisible);
@@ -415 +416 @@
 int CrDpLoadState(PCR_DISPLAY pDisplay, PSSMHANDLE pSSM, uint32_t version);
 
+void CrDpReparent(PCR_DISPLAY pDisplay, CRScreenInfo *pScreen);
+
 void CrDpResize(PCR_DISPLAY pDisplay, int32_t xPos, int32_t yPos, uint32_t width, uint32_t height);
 void CrDpEntryInit(PCR_DISPLAY_ENTRY pEntry, const VBOXVR_TEXTURE *pTextureData);

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;

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

@@ -762 +762 @@
 void crServerVBoxCompositionDisableLeave(CRMuralInfo *mural, GLboolean fForcePresentOnEnabled)
 {
-    mural->fForcePresentState = fForcePresentOnEnabled;
+    mural->fForcePresentState |= fForcePresentOnEnabled;
     --mural->cDisabled;
     Assert(mural->cDisabled < UINT32_MAX/2);
@@ -788 +788 @@
 DECLEXPORT(void) crServerVBoxCompositionSetEnableStateGlobal(GLboolean fEnable)
 {
+    int i;
+
     crHashtableWalk(cr_server.muralTable, crServerVBoxCompositionSetEnableStateGlobalCB, (void*)(uintptr_t)fEnable);
 
     crHashtableWalk(cr_server.dummyMuralTable, crServerVBoxCompositionSetEnableStateGlobalCB, (void*)(uintptr_t)fEnable);
+
+    for (i = 0; i < cr_server.screenCount; ++i)
+    {
+        PCR_DISPLAY pDisplay = crServerDisplayGetInitialized((uint32_t)i);
+        if (!pDisplay)
+            continue;
+
+        if (!fEnable)
+            CrDpEnter(pDisplay);
+        else
+            CrDpLeave(pDisplay);
+    }
 }
 

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

@@ -34 +34 @@
 #include <iprt/memcache.h>
 
+#include "render/renderspu.h"
 
 /* DISPLAY */
@@ -70 +71 @@
         return VERR_GENERAL_FAILURE;
     }
+
+    crServerMuralVisibleRegion(&pDisplay->Mural, 0, NULL);
+    crServerMuralShow(&pDisplay->Mural, GL_TRUE);
+
     pDisplay->fForcePresent = GL_FALSE;
     return VINF_SUCCESS;
@@ -81 +86 @@
 void CrDpResize(PCR_DISPLAY pDisplay, int32_t xPos, int32_t yPos, uint32_t width, uint32_t height)
 {
-    crServerMuralVisibleRegion(&pDisplay->Mural, 0, NULL);
-    crServerMutalPosition(&pDisplay->Mural, xPos, yPos);
-    crServerMuralSize(&pDisplay->Mural, width, height);
-    crServerMuralShow(&pDisplay->Mural, GL_TRUE);
-    CrVrScrCompositorSetStretching(&pDisplay->Mural.Compositor, 1., 1.);
-}
+    if (xPos != pDisplay->Mural.gX
+            || yPos != pDisplay->Mural.gY
+            || width != pDisplay->Mural.width
+            || height != pDisplay->Mural.height)
+    {
+        crServerMuralPosition(&pDisplay->Mural, xPos, yPos, GL_TRUE);
+        if (!crServerMuralSize(&pDisplay->Mural, width, height))
+            crServerCheckMuralGeometry(&pDisplay->Mural);
+    }
+    else
+        crServerCheckMuralGeometry(&pDisplay->Mural);
+}
+
+void CrDpReparent(PCR_DISPLAY pDisplay, CRScreenInfo *pScreen)
+{
+    renderspuSetWindowId(pScreen->winID);
+    crServerWindowReparent(&pDisplay->Mural);
+    renderspuSetWindowId(cr_server.screen[0].winID);
+
+    CrDpResize(pDisplay, pScreen->x, pScreen->y, pScreen->w, pScreen->h);
+}
+
 
 int CrDpSaveState(PCR_DISPLAY pDisplay, PSSMHANDLE pSSM)
@@ -270 +291 @@
 void CrDpEnter(PCR_DISPLAY pDisplay)
 {
-    pDisplay->fForcePresent = crServerVBoxCompositionPresentNeeded(&pDisplay->Mural);
+    pDisplay->fForcePresent |= crServerVBoxCompositionPresentNeeded(&pDisplay->Mural);
     crServerVBoxCompositionDisableEnter(&pDisplay->Mural);
 }
@@ -278 +299 @@
     pDisplay->Mural.fDataPresented = GL_TRUE;
     crServerVBoxCompositionDisableLeave(&pDisplay->Mural, pDisplay->fForcePresent);
+    pDisplay->fForcePresent = GL_FALSE;
 }
 
@@ -503 +525 @@
 PCR_DISPLAY crServerDisplayGetInitialized(uint32_t idScreen)
 {
-    if (ASMBitTest(cr_server.DisplaysInitMap, idScreen))
-        return &cr_server.aDispplays[idScreen];
-    return NULL;
-}
-
-static PCR_DISPLAY crServerDisplayGet(uint32_t idScreen)
-{
     if (idScreen >= CR_MAX_GUEST_MONITORS)
     {
@@ -517 +532 @@
 
     if (ASMBitTest(cr_server.DisplaysInitMap, idScreen))
+    {
+        Assert(cr_server.aDispplays[idScreen].Mural.screenId == idScreen);
         return &cr_server.aDispplays[idScreen];
+    }
+    return NULL;
+}
+
+static PCR_DISPLAY crServerDisplayGet(uint32_t idScreen)
+{
+    if (idScreen >= CR_MAX_GUEST_MONITORS)
+    {
+        crWarning("invalid idScreen %d", idScreen);
+        return NULL;
+    }
+
+    if (ASMBitTest(cr_server.DisplaysInitMap, idScreen))
+    {
+        Assert(cr_server.aDispplays[idScreen].Mural.screenId == idScreen);
+        return &cr_server.aDispplays[idScreen];
+    }
 
      int rc = CrDpInit(&cr_server.aDispplays[idScreen]);
@@ -549 +583 @@
     AssertRCReturn(rc, rc);
 
+    if (!cDisplays)
+        return VINF_SUCCESS;
+
+    rc = SSMR3PutS32(pSSM, cr_server.screenCount);
+    AssertRCReturn(rc, rc);
+
+    for (i = 0; i < cr_server.screenCount; ++i)
+    {
+        rc = SSMR3PutS32(pSSM, cr_server.screen[i].x);
+        AssertRCReturn(rc, rc);
+
+        rc = SSMR3PutS32(pSSM, cr_server.screen[i].y);
+        AssertRCReturn(rc, rc);
+
+        rc = SSMR3PutU32(pSSM, cr_server.screen[i].w);
+        AssertRCReturn(rc, rc);
+
+        rc = SSMR3PutU32(pSSM, cr_server.screen[i].h);
+        AssertRCReturn(rc, rc);
+    }
+
     for (i = 0; i < cr_server.screenCount; ++i)
     {
@@ -567 +622 @@
 {
     int rc;
-    int s32, i;
-
-    rc = SSMR3GetS32(pSSM, &s32);
+    int cDisplays, screenCount, i;
+
+    rc = SSMR3GetS32(pSSM, &cDisplays);
     AssertRCReturn(rc, rc);
 
-    for (i = 0; i < s32; ++i)
+    if (!cDisplays)
+        return VINF_SUCCESS;
+
+    rc = SSMR3GetS32(pSSM, &screenCount);
+    AssertRCReturn(rc, rc);
+
+    CRASSERT(screenCount == cr_server.screenCount);
+
+    crServerVBoxCompositionSetEnableStateGlobal(GL_FALSE);
+
+    for (i = 0; i < cr_server.screenCount; ++i)
+    {
+        int32_t    x, y;
+        uint32_t   w, h;
+        rc = SSMR3GetS32(pSSM, &x);
+        AssertRCReturn(rc, rc);
+
+        rc = SSMR3GetS32(pSSM, &y);
+        AssertRCReturn(rc, rc);
+
+        rc = SSMR3GetU32(pSSM, &w);
+        AssertRCReturn(rc, rc);
+
+        rc = SSMR3GetU32(pSSM, &h);
+        AssertRCReturn(rc, rc);
+
+        rc = crVBoxServerMapScreen(i, x, y, w, h, cr_server.screen[i].winID);
+        AssertRCReturn(rc, rc);
+    }
+
+    crServerVBoxCompositionSetEnableStateGlobal(GL_TRUE);
+
+    for (i = 0; i < cDisplays; ++i)
     {
         int iScreen;
@@ -716 +803 @@
 {
     uint32_t idScreen = CR_PRESENT_GET_SCREEN(cfg);
-    PCR_DISPLAY pDisplay = crServerDisplayGet(idScreen);
-    if (!pDisplay)
-    {
-        crWarning("crServerDisplayGet Failed");
+    if (idScreen >= CR_MAX_GUEST_MONITORS)
+    {
+        crWarning("Invalid guest screen");
         return;
     }
 
+    PCR_DISPLAY pDisplay;
     PCR_DISPLAY_ENTRY pEntry = NULL;
+
     if (texture)
     {
@@ -730 +818 @@
         {
             crWarning("CrDemEntryAcquire Failed");
+            return;
+        }
+
+        pDisplay = crServerDisplayGet(idScreen);
+        if (!pDisplay)
+        {
+            crWarning("crServerDisplayGet Failed");
+            return;
+        }
+    }
+    else
+    {
+        pDisplay = crServerDisplayGetInitialized(idScreen);
+        if (!pDisplay)
+        {
+            /* no display initialized, and nothing to present */
             return;
         }