Changeset 50973 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Apr 4, 2014 6:31:40 PM (11 years ago)

Author:

vboxsync

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

93141

Message:

crOpenGL: command blocks (disabled for now)

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_config.c (modified) (2 diffs)
• server_stream.c (modified) (5 diffs)

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

@@ -226 +226 @@
     {
         cr_server.u32Caps = crServerVBoxParseNumerics(env, 0);
-        cr_server.u32Caps &= ~(CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_CMDVBVA);
+        cr_server.u32Caps &= ~(CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_CMDVBVA | CR_VBOX_CAP_CMDBLOCKS);
     }
     else
     {
-        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT/* | CR_VBOX_CAP_CMDVBVA*/;
+        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT
 #ifdef DEBUG_misha
-        cr_server.u32Caps |= CR_VBOX_CAP_CMDVBVA;
+                | CR_VBOX_CAP_CMDVBVA | CR_VBOX_CAP_CMDBLOCKS
 #endif
+                ;
 
     }
@@ -376 +377 @@
     {
         cr_server.u32Caps = crServerVBoxParseNumerics(env, 0);
-        cr_server.u32Caps &= ~(CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_CMDVBVA);
+        cr_server.u32Caps &= ~(CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_CMDVBVA | CR_VBOX_CAP_CMDBLOCKS);
     }
     else
     {
-        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT/* | CR_VBOX_CAP_CMDVBVA*/;
+        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT
 #ifdef DEBUG_misha
-        cr_server.u32Caps |= CR_VBOX_CAP_CMDVBVA;
+                | CR_VBOX_CAP_CMDVBVA | CR_VBOX_CAP_CMDBLOCKS
 #endif
+                ;
     }
 

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

@@ -416 +416 @@
 }
 
+typedef struct CR_SERVER_PENDING_MSG
+{
+    RTLISTNODE Node;
+    CRMessage Msg;
+} CR_SERVER_PENDING_MSG;
+
+static int crServerPendMsg(CRConnection *conn, const CRMessage *msg, int cbMsg)
+{
+    CR_SERVER_PENDING_MSG *pMsg = (CR_SERVER_PENDING_MSG*)RTMemAlloc(cbMsg + RT_OFFSETOF(CR_SERVER_PENDING_MSG, Msg));
+    if (!pMsg)
+    {
+        WARN(("RTMemAlloc failed"));
+        return VERR_NO_MEMORY;
+    }
+
+    memcpy(&pMsg->Msg, msg, cbMsg);
+
+    RTListAppend(&conn->PendingMsgList, &pMsg->Node);
+
+    return VINF_SUCCESS;
+}
+
+static void crServerPendProcess(CRConnection *conn)
+{
+    CR_SERVER_PENDING_MSG *pIter, *pNext;
+    RTListForEachSafe(&conn->PendingMsgList, pIter, pNext, CR_SERVER_PENDING_MSG, Node)
+    {
+        CRMessage *msg = &pIter->Msg;
+        const CRMessageOpcodes *msg_opcodes;
+        int opcodeBytes;
+        const char *data_ptr;
+
+        RTListNodeRemove(&pIter->Node);
+
+        CRASSERT(msg->header.type == CR_MESSAGE_OPCODES);
+
+        msg_opcodes = (const CRMessageOpcodes *) msg;
+        opcodeBytes = (msg_opcodes->numOpcodes + 3) & ~0x03;
+
+        data_ptr = (const char *) msg_opcodes + sizeof (CRMessageOpcodes) + opcodeBytes;
+
+        crUnpack(data_ptr,                 /* first command's operands */
+                 data_ptr - 1,             /* first command's opcode */
+                 msg_opcodes->numOpcodes,  /* how many opcodes */
+                 &(cr_server.dispatch));   /* the CR dispatch table */
+
+        RTMemFree(pIter);
+    }
+}
 
 /**
@@ -422 +471 @@
  */
 static void
-crServerDispatchMessage(CRConnection *conn, CRMessage *msg)
+crServerDispatchMessage(CRConnection *conn, CRMessage *msg, int cbMsg)
 {
     const CRMessageOpcodes *msg_opcodes;
@@ -430 +479 @@
     PCRVBOXHGSMI_CMDDATA pCmdData = NULL;
 #endif
+    CR_UNPACK_BUFFER_TYPE enmType;
+    bool fUnpack = true;
 
     if (msg->header.type == CR_MESSAGE_REDIR_PTR)
@@ -450 +501 @@
 
     data_ptr = (const char *) msg_opcodes + sizeof(CRMessageOpcodes) + opcodeBytes;
-    crUnpack(data_ptr,                 /* first command's operands */
-             data_ptr - 1,             /* first command's opcode */
-             msg_opcodes->numOpcodes,  /* how many opcodes */
-             &(cr_server.dispatch));   /* the CR dispatch table */
+
+    enmType = crUnpackGetBufferType(data_ptr - 1,             /* first command's opcode */
+                msg_opcodes->numOpcodes  /* how many opcodes */);
+    switch (enmType)
+    {
+        case CR_UNPACK_BUFFER_TYPE_GENERIC:
+        {
+            if (RTListIsEmpty(&conn->PendingMsgList))
+                break;
+
+            if (RT_SUCCESS(crServerPendMsg(conn, msg, cbMsg)))
+            {
+                fUnpack = false;
+                break;
+            }
+
+            WARN(("crServerPendMsg failed"));
+            crServerPendProcess(conn);
+            break;
+        }
+        case CR_UNPACK_BUFFER_TYPE_CMDBLOCK_BEGIN:
+        {
+            if (RTListIsEmpty(&conn->PendingMsgList))
+            {
+                if (RT_SUCCESS(crServerPendMsg(conn, msg, cbMsg)))
+                {
+                    Assert(!RTListIsEmpty(&conn->PendingMsgList));
+                    fUnpack = false;
+                    break;
+                }
+                else
+                    WARN(("crServerPendMsg failed"));
+            }
+            else
+                WARN(("Pend List is NOT empty, drain the current list, and ignore this command"));
+
+            crServerPendProcess(conn);
+            break;
+        }
+        case CR_UNPACK_BUFFER_TYPE_CMDBLOCK_END:
+        {
+            CRASSERT(!RTListIsEmpty(&conn->PendingMsgList));
+            crServerPendProcess(conn);
+            Assert(RTListIsEmpty(&conn->PendingMsgList));
+            break;
+        }
+        default:
+            WARN(("unsupported buffer type"));
+            break;
+    }
+
+    if (fUnpack)
+    {
+        crUnpack(data_ptr,                 /* first command's operands */
+                 data_ptr - 1,             /* first command's opcode */
+                 msg_opcodes->numOpcodes,  /* how many opcodes */
+                 &(cr_server.dispatch));   /* the CR dispatch table */
+    }
 
 #ifdef VBOX_WITH_CRHGSMI
@@ -584 +689 @@
 
         /* Commands get dispatched here */
-        crServerDispatchMessage( conn, msg );
+        crServerDispatchMessage( conn, msg, len );
 
         crNetFree( conn, msg );