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

Timestamp:

Apr 25, 2014 12:51:03 PM (11 years ago)

Author:

vboxsync

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

93459

Message:

crOpenGL: crcmd enhancements & fixes; osx deadlock fix; temporary disabled crcmd for testing

File:

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

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

@@ -3659 +3659 @@
     pData->aParms[4].u.uint32 = height;
 
-    return crCtlSubmitSync(&pData->Hdr, cbData);
+    return crCtlSubmitSyncIfHasDataForScreen(aScreenId, &pData->Hdr, cbData);
 }
 #endif
@@ -4518 +4518 @@
     }
     return rc;
+}
+
+int Display::crCtlSubmitSyncIfHasDataForScreen(uint32_t u32ScreenID, struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd)
+{
+    if (mCrOglCallbacks.pfnHasDataForScreen(u32ScreenID))
+        return crCtlSubmitSync(pCmd, cbCmd);
+
+    VBOXCRCMDCTL* pCmdCopy = (VBOXCRCMDCTL*)RTMemAlloc(cbCmd);
+    if (!pCmdCopy)
+    {
+        LogRel(("RTMemAlloc failed\n"));
+        return VERR_NO_MEMORY;
+    }
+
+    memcpy(pCmdCopy, pCmd, cbCmd);
+
+    int rc = crCtlSubmit(pCmdCopy, cbCmd, displayCrCmdFree, pCmdCopy);
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("crCtlSubmit failed %d\n", rc));
+        RTMemFree(pCmdCopy);
+        return rc;
+    }
+
+    return VINF_SUCCESS;
 }