Changeset 49474 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Nov 14, 2013 6:49:54 AM (11 years ago)

Author:

vboxsync

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

90613

Message:

crOpenGL: some host bits for buffer-based command submission

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (1 diff)
• crserverlib/server.h (modified) (1 diff)
• crserverlib/server_main.c (modified) (12 diffs)
• crserverlib/server_window.c (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -953 +953 @@
     switch (u32Function)
     {
+        case SHCRGL_HOST_FN_CRCMD_NOTIFY_CMDS:
+        {
+            rc = crVBoxServerCrCmdNotifyCmds();
+        } break;
 #ifdef VBOX_WITH_CRHGSMI
         case SHCRGL_HOST_FN_CRHGSMI_CMD:

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

@@ -48 +48 @@
 
 #define VBOXCRHGSMI_CMD_CHECK_COMPLETE(_pData, _rc) do { \
-        if (CRVBOXHGSMI_CMDDATA_IS_SET(_pData)) { \
+        if (CRVBOXHGSMI_CMDDATA_IS_COMPLETE_NEEDED(_pData) && CRVBOXHGSMI_CMDDATA_IS_SET(_pData)) { \
             VBOXCRHGSMI_CMD_COMPLETE(_pData, _rc); \
         } \

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

@@ -3056 +3056 @@
  * NOTE: it is ALWAYS responsibility of the crVBoxServerCrHgsmiCmd to complete the command!
  * */
-int32_t crVBoxServerCrHgsmiCmd(struct VBOXVDMACMD_CHROMIUM_CMD *pCmd, uint32_t cbCmd)
+static int32_t crVBoxServerCrHgsmiCmdProcess(struct VBOXVDMACMD_CHROMIUM_CMD *pCmd, bool fCompleteNeeded)
 {
     int32_t rc;
@@ -3070 +3070 @@
     {
         crWarning("g_pvVRamBase is not initialized");
+        if (!fCompleteNeeded)
+            return VERR_INVALID_STATE;
+
         crServerCrHgsmiCmdComplete(pCmd, VERR_INVALID_STATE);
         return VINF_SUCCESS;
@@ -3077 +3080 @@
     {
         crWarning("zero buffers passed in!");
+        if (!fCompleteNeeded)
+            return VERR_INVALID_PARAMETER;
+
         crServerCrHgsmiCmdComplete(pCmd, VERR_INVALID_PARAMETER);
         return VINF_SUCCESS;
@@ -3088 +3094 @@
     {
         crWarning("invalid header buffer!");
+        if (!fCompleteNeeded)
+            return VERR_INVALID_PARAMETER;
+
         crServerCrHgsmiCmdComplete(pCmd, VERR_INVALID_PARAMETER);
         return VINF_SUCCESS;
@@ -3095 +3104 @@
     {
         crWarning("invalid header buffer size!");
+        if (!fCompleteNeeded)
+            return VERR_INVALID_PARAMETER;
+
         crServerCrHgsmiCmdComplete(pCmd, VERR_INVALID_PARAMETER);
         return VINF_SUCCESS;
@@ -3144 +3156 @@
                 pClient->conn->pBuffer = pBuffer;
                 pClient->conn->cbBuffer = cbBuffer;
-                CRVBOXHGSMI_CMDDATA_SET(&pClient->conn->CmdData, pCmd, pHdr);
+                CRVBOXHGSMI_CMDDATA_SET(&pClient->conn->CmdData, pCmd, pHdr, fCompleteNeeded);
                 rc = crVBoxServerInternalClientWriteRead(pClient);
                 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData);
@@ -3199 +3211 @@
                 pClient->conn->pBuffer = pBuffer;
                 pClient->conn->cbBuffer = cbBuffer;
-                CRVBOXHGSMI_CMDDATA_SET(&pClient->conn->CmdData, pCmd, pHdr);
+                CRVBOXHGSMI_CMDDATA_SET(&pClient->conn->CmdData, pCmd, pHdr, fCompleteNeeded);
                 rc = crVBoxServerInternalClientWriteRead(pClient);
                 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData);
@@ -3255 +3267 @@
                 /* the read command is never pended, complete it right away */
                 pHdr->result = rc;
+
+                if (!fCompleteNeeded)
+                    return VINF_SUCCESS;
+
                 crServerCrHgsmiCmdComplete(pCmd, VINF_SUCCESS);
                 return VINF_SUCCESS;
@@ -3319 +3335 @@
                 pClient->conn->pBuffer = pBuffer;
                 pClient->conn->cbBuffer = cbBuffer;
-                CRVBOXHGSMI_CMDDATA_SETWB(&pClient->conn->CmdData, pCmd, pHdr, pWriteback, cbWriteback, &pFnCmd->cbWriteback);
+                CRVBOXHGSMI_CMDDATA_SETWB(&pClient->conn->CmdData, pCmd, pHdr, pWriteback, cbWriteback, &pFnCmd->cbWriteback, fCompleteNeeded);
                 rc = crVBoxServerInternalClientWriteRead(pClient);
                 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData);
@@ -3356 +3372 @@
     CRASSERT(RT_FAILURE(rc));
     pHdr->result = rc;
+
+    if (!fCompleteNeeded)
+        return rc;
+
     crServerCrHgsmiCmdComplete(pCmd, VINF_SUCCESS);
     return rc;
+}
+
+int32_t crVBoxServerCrHgsmiCmd(struct VBOXVDMACMD_CHROMIUM_CMD *pCmd, uint32_t cbCmd)
+{
+    return crVBoxServerCrHgsmiCmdProcess(pCmd, true);
 }
 
@@ -3371 +3396 @@
             g_pvVRamBase = (uint8_t*)pSetup->pvVRamBase;
             g_cbVRam = pSetup->cbVRam;
+            cr_server.CltInfo = *pSetup->pCrCmdClientInfo;
             rc = VINF_SUCCESS;
             break;
@@ -3399 +3425 @@
     return rc;
 }
-#endif
+
+static int32_t crVBoxServerCrCmdProcess(PVBOXCMDVBVA_HDR pCmd, uint32_t cbCmd)
+{
+    switch (pCmd->u8OpCode)
+    {
+        case VBOXCMDVBVA_OPTYPE_CRCMD:
+        {
+            VBOXCMDVBVA_CRCMD *pCrCmdDr = (VBOXCMDVBVA_CRCMD*)pCmd;
+            VBOXCMDVBVAOFFSET offCmd = pCrCmdDr->offCmd;
+            if (offCmd < g_cbVRam && offCmd + cbCmd < g_cbVRam)
+            {
+                VBOXVDMACMD_CHROMIUM_CMD *pCrCmd = (VBOXVDMACMD_CHROMIUM_CMD*)(g_pvVRamBase + offCmd);
+                crVBoxServerCrHgsmiCmdProcess(pCrCmd, false);
+                /* success */
+                pCmd->i8Result = 0;
+            }
+            else
+            {
+                crWarning("incorrect command info!");
+                pCmd->i8Result = -1;
+            }
+            break;
+        }
+        default:
+            crWarning("unsupported command");
+            pCmd->i8Result = -1;
+    }
+    return VINF_SUCCESS;
+}
+
+int32_t crVBoxServerCrCmdNotifyCmds()
+{
+    PVBOXCMDVBVA_HDR pCmd = NULL;
+    uint32_t cbCmd;
+
+    for (;;)
+    {
+        int rc = cr_server.CltInfo.pfnCmdGet(cr_server.CltInfo.hClient, &pCmd, &cbCmd);
+        if (rc == VINF_EOF)
+            return VINF_SUCCESS;
+        if (!RT_SUCCESS(rc))
+            return rc;
+
+        rc = crVBoxServerCrCmdProcess(pCmd, cbCmd);
+        if (!RT_SUCCESS(rc))
+            return rc;
+    }
+
+    /* should not be here! */
+    AssertFailed();
+    return VERR_INTERNAL_ERROR;
+}
+#endif

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

@@ -318 +318 @@
 }
 
-static bool crServerVBoxTranslateIntersectRect(CRMuralInfo *mural, const RTRECT *pSrcRect, PRTRECT pDstRect)
-{
-    int32_t xLeft = RT_MAX(mural->gX, pSrcRect->xRight);
-    int32_t yTop = RT_MAX(mural->gY, pSrcRect->yBottom);
-    int32_t xRight = RT_MIN(mural->gX + mural->width, pSrcRect->xLeft);
-    int32_t yBottom = RT_MIN(mural->gY + mural->height, pSrcRect->yTop);
-
-    if (xLeft < xRight && yTop < yBottom)
-    {
-        pDstRect->xLeft = xLeft;
-        pDstRect->yTop = yTop;
-        pDstRect->xRight = xRight;
-        pDstRect->yBottom = yBottom;
-        return true;
-    }
-
-    return false;
-}
-
 static void crServerVBoxRootVrTranslateForMural(CRMuralInfo *mural)
 {