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

Timestamp:

Jan 28, 2014 9:13:59 AM (11 years ago)

Author:

vboxsync

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

91870

Message:

crOpenGL: async notifications

File:

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

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

@@ -935 +935 @@
                 VMMDev *pVMMDev = mParent->getVMMDev();
                 if (pVMMDev)
-                    pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SCREEN_CHANGED, SHCRGL_CPARMS_SCREEN_CHANGED, &parm);
+                {
+                    if (mhCrOglSvc)
+                        pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_SCREEN_CHANGED, &parm, NULL, NULL);
+                    else
+                        AssertMsgFailed(("mhCrOglSvc is NULL\n"));
+                }
             }
         }
@@ -1251 +1256 @@
     if (is3denabled && vmmDev)
     {
-        VBOXHGCMSVCPARM parms[2];
-
-        parms[0].type = VBOX_HGCM_SVC_PARM_PTR;
-        parms[0].u.pointer.addr = pRect;
-        parms[0].u.pointer.size = 0;  /* We don't actually care. */
-        parms[1].type = VBOX_HGCM_SVC_PARM_32BIT;
-        parms[1].u.uint32 = cRect;
-
-        vmmDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_VISIBLE_REGION, 2, &parms[0]);
+        if (mhCrOglSvc)
+        {
+            RTRECT *pRectsCopy = (RTRECT *)RTMemAlloc(  RT_MAX(cRect, 1)
+                                                             * sizeof (RTRECT));
+            if (pRectsCopy)
+            {
+                memcpy(pRectsCopy, pRect, cRect * sizeof (RTRECT));
+
+                VBOXHGCMSVCPARM parm;
+
+                parm.type = VBOX_HGCM_SVC_PARM_PTR;
+                parm.u.pointer.addr = pRectsCopy;
+                parm.u.pointer.size = cRect * sizeof (RTRECT);
+
+                vmmDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_SET_VISIBLE_REGION, &parm, displayCrAsyncCmdCompletion, this);
+            }
+            else
+                AssertMsgFailed(("failed to allocate rects memory\n"));
+        }
+        else
+            AssertMsgFailed(("mhCrOglSvc is NULL\n"));
     }
 #endif
@@ -1674 +1691 @@
     if (cbDst >= VBVA_RING_BUFFER_SIZE)
     {
-        AssertMsgFailed (("cbDst = 0x%08X, ring buffer size 0x%08X", cbDst, VBVA_RING_BUFFER_SIZE));
+        AssertMsgFailed (("cbDst = 0x%08X, ring buffer size 0x%08X\n", cbDst, VBVA_RING_BUFFER_SIZE));
         return;
     }
@@ -2214 +2231 @@
 
                 if (pVMMDev)
-                    vrc = pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SCREEN_CHANGED, SHCRGL_CPARMS_SCREEN_CHANGED, &parm);
+                {
+                    if (mhCrOglSvc)
+                        pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_SCREEN_CHANGED, &parm, NULL, NULL);
+                    else
+                        AssertMsgFailed(("mhCrOglSvc is NULL\n"));
+                }
                 /*ComAssertRCRet (vrc, E_FAIL);*/
 
@@ -2345 +2367 @@
         if (is3denabled && vmmDev)
         {
-            VBOXHGCMSVCPARM parms[2];
-
-            parms[0].type = VBOX_HGCM_SVC_PARM_PTR;
+            VBOXHGCMSVCPARM parm;
+
+            parm.type = VBOX_HGCM_SVC_PARM_PTR;
             /* NULL means disable */
-            parms[0].u.pointer.addr = NULL;
-            parms[0].u.pointer.size = 0;  /* We don't actually care. */
-            parms[1].type = VBOX_HGCM_SVC_PARM_32BIT;
-            parms[1].u.uint32 = 0;
-
-            vmmDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_VISIBLE_REGION, 2, &parms[0]);
+            parm.u.pointer.addr = NULL;
+            parm.u.pointer.size = 0;  /* <- means null rects, NULL pRects address and 0 rects means "disable" */
+
+            if (mhCrOglSvc)
+                vmmDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_SET_VISIBLE_REGION, &parm, NULL, NULL);
+            else
+                AssertMsgFailed(("mhCrOglSvc is NULL\n"));
+
         }
     }
@@ -3312 +3336 @@
 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);
+    VBOXHGCMSVCPARM parm;
+
+    CRVBOXHGCMVIEWPORT *pViewportInfo = (CRVBOXHGCMVIEWPORT*)RTMemAlloc(sizeof (*pViewportInfo));
+    if(!pViewportInfo)
+    {
+        AssertMsgFailed(("RTMemAlloc failed!\n"));
+        return;
+    }
+
+    pViewportInfo->u32Screen = aScreenId;
+    pViewportInfo->x = x;
+    pViewportInfo->y = y;
+    pViewportInfo->width = width;
+    pViewportInfo->height = height;
+
+    parm.type = VBOX_HGCM_SVC_PARM_PTR;
+    parm.u.pointer.addr = pViewportInfo;
+    parm.u.pointer.size = sizeof (*pViewportInfo);
+
+    pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_VIEWPORT_CHANGED, &parm, displayCrAsyncCmdCompletion, this);
 
 }