Changeset 51460 in vbox for trunk/src/VBox

Timestamp:

May 29, 2014 12:44:48 PM (11 years ago)

Author:

vboxsync

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

94030

Message:

main: async call crogl when needed

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (2 diffs)
• src-client/DisplayImpl.cpp (modified) (6 diffs)

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

@@ -371 +371 @@
     void vbvaReleaseCmd(VBVACMDHDR *pHdr, int32_t cbCmd);
 
-    void handleResizeCompletedEMT(unsigned uScreenId);
+    void handleResizeCompletedEMT(unsigned uScreenId, BOOL fResizeContext);
 
     RTCRITSECT mVBVALock;
@@ -390 +390 @@
     int crCtlSubmit(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, PFNCRCTLCOMPLETION pfnCompletion, void *pvCompletion);
     int crCtlSubmitSync(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd);
+    /* copies the given command and submits it asynchronously,
+     * i.e. the pCmd data may be discarded right after the call returns */
+    int crCtlSubmitAsyncCmdCopy(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd);
     /* performs synchronous request processing if 3D backend has something to display
      * this is primarily to work-around 3d<->main thread deadlocks on OSX

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

@@ -1043 +1043 @@
 
     /* The method also unlocks the framebuffer. */
-    handleResizeCompletedEMT(uScreenId);
+    handleResizeCompletedEMT(uScreenId, TRUE);
 
     return VINF_SUCCESS;
@@ -1054 +1054 @@
  *  @thread EMT
  */
-void Display::handleResizeCompletedEMT(unsigned uScreenId)
+void Display::handleResizeCompletedEMT(unsigned uScreenId, BOOL fResizeContext)
 {
     LogRelFlowFunc(("\n"));
@@ -1161 +1161 @@
                 data.aParms[0].u.uint32 = uScreenId;
 
-                crCtlSubmitSync(&data.Hdr, sizeof (data));
+                if (fResizeContext)
+                    crCtlSubmitAsyncCmdCopy(&data.Hdr, sizeof (data));
+                else
+                    crCtlSubmitSync(&data.Hdr, sizeof (data));
             }
         }
@@ -4089 +4092 @@
             fNoUpdate = true; /* Always set it here, because pfnUpdateDisplayAll can cause a new resize. */
             /* The framebuffer was resized and display data need to be updated. */
-            pDisplay->handleResizeCompletedEMT(uScreenId);
+            pDisplay->handleResizeCompletedEMT(uScreenId, FALSE);
             if (pFBInfo->u32ResizeStatus != ResizeStatus_Void)
             {
@@ -4744 +4747 @@
 }
 
-int Display::crCtlSubmitSyncIfHasDataForScreen(uint32_t u32ScreenID, struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd)
-{
-    if (mCrOglCallbacks.pfnHasDataForScreen(u32ScreenID))
-        return crCtlSubmitSync(pCmd, cbCmd);
-
+int Display::crCtlSubmitAsyncCmdCopy(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd)
+{
     VBOXCRCMDCTL* pCmdCopy = (VBOXCRCMDCTL*)RTMemAlloc(cbCmd);
     if (!pCmdCopy)
@@ -4767 +4767 @@
 
     return VINF_SUCCESS;
+}
+
+int Display::crCtlSubmitSyncIfHasDataForScreen(uint32_t u32ScreenID, struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd)
+{
+    if (mCrOglCallbacks.pfnHasDataForScreen(u32ScreenID))
+        return crCtlSubmitSync(pCmd, cbCmd);
+
+    return crCtlSubmitAsyncCmdCopy(pCmd, cbCmd);
 }