Changeset 50095 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jan 17, 2014 4:34:07 PM (11 years ago)

Author:

vboxsync

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

91620

Message:

crOpenGL: presentation infrastructure rework (still work in progress)

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (10 diffs)

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

@@ -497 +497 @@
         maFramebuffers[ul].pVBVAHostFlags = NULL;
 #endif /* VBOX_WITH_HGSMI */
+#ifdef VBOX_WITH_CROGL
+        RT_ZERO(maFramebuffers[ul].pendingViewportInfo);
+#endif
     }
 
@@ -650 +653 @@
     }
 
+    return VINF_SUCCESS;
+}
+
+int Display::notifyCroglResize(const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM)
+{
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
+    BOOL is3denabled;
+    mParent->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
+
+    if (is3denabled)
+    {
+        VBOXHGCMSVCPARM parm[SHCRGL_CPARMS_DEV_RESIZE];
+
+        parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
+        parm[0].u.pointer.addr = (void*)pScreen;
+        parm[0].u.pointer.size = sizeof (*pScreen);
+        parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
+        parm[1].u.pointer.addr = (void*)pvVRAM;
+        parm[1].u.pointer.size = 0;
+
+        VMMDev *pVMMDev = mParent->getVMMDev();
+
+        if (pVMMDev)
+            return pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_DEV_RESIZE, SHCRGL_CPARMS_DEV_RESIZE, parm);
+        return VERR_INVALID_STATE;
+    }
+#endif /* #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) */
     return VINF_SUCCESS;
 }
@@ -3152 +3182 @@
 {
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
+
+    if (mcMonitors <= aScreenId)
+    {
+        AssertMsgFailed(("invalid screen id\n"));
+        return E_INVALIDARG;
+    }
+
     BOOL is3denabled;
     mParent->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
@@ -3157 +3194 @@
     if (is3denabled)
     {
-        VBOXHGCMSVCPARM aParms[5];
-
-        aParms[0].type = VBOX_HGCM_SVC_PARM_32BIT;
-        aParms[0].u.uint32 = aScreenId;
-
-        aParms[1].type = VBOX_HGCM_SVC_PARM_32BIT;
-        aParms[1].u.uint32 = x;
-
-        aParms[2].type = VBOX_HGCM_SVC_PARM_32BIT;
-        aParms[2].u.uint32 = y;
-
-
-        aParms[3].type = VBOX_HGCM_SVC_PARM_32BIT;
-        aParms[3].u.uint32 = width;
-
-        aParms[4].type = VBOX_HGCM_SVC_PARM_32BIT;
-        aParms[4].u.uint32 = height;
-
         VMMDev *pVMMDev = mParent->getVMMDev();
 
         if (pVMMDev)
-            pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_VIEWPORT_CHANGED, SHCRGL_CPARMS_VIEWPORT_CHANGED, aParms);
+        {
+            crViewportNotify(pVMMDev, aScreenId, x, y, width, height);
+        }
+        else
+        {
+            DISPLAYFBINFO *pFb = &maFramebuffers[aScreenId];
+            pFb->pendingViewportInfo.fPending = true;
+            pFb->pendingViewportInfo.x = x;
+            pFb->pendingViewportInfo.y = y;
+            pFb->pendingViewportInfo.width = width;
+            pFb->pendingViewportInfo.height = height;
+        }
     }
 #endif /* VBOX_WITH_CROGL && VBOX_WITH_HGCM */
@@ -3266 +3296 @@
 }
 
+#ifdef VBOX_WITH_CROGL
+void Display::crViewportNotify(VMMDev *pVMMDev, ULONG aScreenId, ULONG x, ULONG y, ULONG width, ULONG height)
+{
+    VBOXHGCMSVCPARM aParms[5];
+
+    aParms[0].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[0].u.uint32 = aScreenId;
+
+    aParms[1].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[1].u.uint32 = x;
+
+    aParms[2].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[2].u.uint32 = y;
+
+
+    aParms[3].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[3].u.uint32 = width;
+
+    aParms[4].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[4].u.uint32 = height;
+
+    pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_VIEWPORT_CHANGED, SHCRGL_CPARMS_VIEWPORT_CHANGED, aParms);
+
+}
+#endif
+
 #ifdef VBOX_WITH_CRHGSMI
 void Display::setupCrHgsmiData(void)
@@ -3292 +3348 @@
         rc = pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_CRHGSMI_CTL, 1, &parm);
         if (RT_SUCCESS(rc))
+        {
+            ULONG ul;
+
+            for (ul = 0; ul < mcMonitors; ul++)
+            {
+                DISPLAYFBINFO *pFb = &maFramebuffers[ul];
+                if (!pFb->pendingViewportInfo.fPending)
+                    continue;
+
+                crViewportNotify(pVMMDev, ul, pFb->pendingViewportInfo.x, pFb->pendingViewportInfo.y, pFb->pendingViewportInfo.width, pFb->pendingViewportInfo.height);
+                pFb->pendingViewportInfo.fPending = false;
+            }
+
             return;
+        }
 
         AssertMsgFailed(("VBOXVDMACMD_CHROMIUM_CTL_TYPE_CRHGSMI_SETUP_COMPLETION failed rc %d", rc));
@@ -4303 +4373 @@
     if (pScreen->u16Flags & VBVA_SCREEN_F_DISABLED)
     {
+        pThis->notifyCroglResize(pView, pScreen, pvVRAM);
+
         pFBInfo->fDisabled = true;
         pFBInfo->flags = pScreen->u16Flags;
@@ -4325 +4397 @@
      */
     bool fResize = pFBInfo->fDisabled || pFBInfo->pFramebuffer.isNull();
-
-    if (pFBInfo->fDisabled)
-    {
-        pFBInfo->fDisabled = false;
-        fireGuestMonitorChangedEvent(pThis->mParent->getEventSource(),
-                                     GuestMonitorChangedEventType_Enabled,
-                                     pScreen->u32ViewIndex,
-                                     pScreen->i32OriginX, pScreen->i32OriginY,
-                                     pScreen->u32Width, pScreen->u32Height);
-        /* Continue to update pFBInfo. */
-    }
 
     /* Check if this is a real resize or a notification about the screen origin.
@@ -4350 +4411 @@
                       || pFBInfo->yOrigin != pScreen->i32OriginY;
 
+    if (fNewOrigin || fResize)
+        pThis->notifyCroglResize(pView, pScreen, pvVRAM);
+
+    if (pFBInfo->fDisabled)
+    {
+        pFBInfo->fDisabled = false;
+        fireGuestMonitorChangedEvent(pThis->mParent->getEventSource(),
+                                     GuestMonitorChangedEventType_Enabled,
+                                     pScreen->u32ViewIndex,
+                                     pScreen->i32OriginX, pScreen->i32OriginY,
+                                     pScreen->u32Width, pScreen->u32Height);
+        /* Continue to update pFBInfo. */
+    }
+
     pFBInfo->u32Offset = pView->u32ViewOffset; /* Not used in HGSMI. */
     pFBInfo->u32MaxFramebufferSize = pView->u32MaxScreenSize; /* Not used in HGSMI. */
@@ -4374 +4449 @@
                                      0, 0);
     }
-
-#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
-    if (fNewOrigin && !fResize)
-    {
-        BOOL is3denabled;
-        pThis->mParent->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
-
-        if (is3denabled)
-        {
-            VBOXHGCMSVCPARM parm;
-
-            parm.type = VBOX_HGCM_SVC_PARM_32BIT;
-            parm.u.uint32 = pScreen->u32ViewIndex;
-
-            VMMDev *pVMMDev = pThis->mParent->getVMMDev();
-
-            if (pVMMDev)
-                pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SCREEN_CHANGED, SHCRGL_CPARMS_SCREEN_CHANGED, &parm);
-        }
-    }
-#endif /* VBOX_WITH_CROGL */
 
     if (!fResize)