vbox的更動 52451 路徑 trunk/src/VBox/HostServices/SharedOpenGL

時間撮記:

2014-8-21 下午07:20:27 (10 年 以前)

作者:

vboxsync

訊息:

crOpenGL: command blocks flushing

位置:

trunk

檔案:

• . (修改) (1 屬性更動)
• src/VBox (修改) (1 屬性更動)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server.h (修改) (1 筆差異)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c (修改) (2 筆差異)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (修改) (1 筆差異)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_stream.c (修改) (1 筆差異)
• src/VBox/HostServices/SharedOpenGL/unpacker/unpack.py (修改) (3 筆差異)

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

@@ -420 +420 @@
 int CrPMgrLoadState(PSSMHANDLE pSSM, uint32_t version);
 HCR_FRAMEBUFFER CrPMgrFbGet(uint32_t idScreen);
+int CrPMgrClearRegionsGlobal();
 /*cleanup stuff*/
 

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

@@ -178 +178 @@
                 | CR_VBOX_CAP_CMDBLOCKS
                 | CR_VBOX_CAP_GETATTRIBSLOCATIONS
+                | CR_VBOX_CAP_CMDBLOCKS_FLUSH
                 ;
     }
@@ -328 +329 @@
                 | CR_VBOX_CAP_CMDBLOCKS
                 | CR_VBOX_CAP_GETATTRIBSLOCATIONS
+                | CR_VBOX_CAP_CMDBLOCKS_FLUSH
                 ;
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -4890 +4890 @@
 }
 
+int CrPMgrClearRegionsGlobal()
+{
+    for (HCR_FRAMEBUFFER hFb = CrPMgrFbGetFirstEnabled();
+            hFb;
+            hFb = CrPMgrFbGetNextEnabled(hFb))
+    {
+        int rc = CrFbUpdateBegin(hFb);
+        if (RT_SUCCESS(rc))
+        {
+            rc = CrFbRegionsClear(hFb);
+            if (RT_FAILURE(rc))
+            {
+                WARN(("CrFbRegionsClear failed %d", rc));
+            }
+
+            CrFbUpdateEnd(hFb);
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
 int CrPMgrModeVrdp(bool fEnable)
 {

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

@@ -655 +655 @@
             break;
         }
+        case CR_UNPACK_BUFFER_TYPE_CMDBLOCK_FLUSH: /* just flush for now */
+        {
+            CrPMgrClearRegionsGlobal(); /* clear regions to ensure we don't do MakeCurrent and friends */
+            crServerPendProcess(conn);
+            Assert(RTListIsEmpty(&conn->PendingMsgList));
+            break;
+        }
         case CR_UNPACK_BUFFER_TYPE_CMDBLOCK_END:
         {
-            CRASSERT(!RTListIsEmpty(&conn->PendingMsgList));
+//            CRASSERT(!RTListIsEmpty(&conn->PendingMsgList));
             crServerPendProcess(conn);
             Assert(RTListIsEmpty(&conn->PendingMsgList));

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack.py

@@ -211 +211 @@
     const uint8_t *pu8Codes = (const uint8_t *)opcodes;
 
-    CR_UNPACK_BUFFER_TYPE enmType;
     uint8_t first;
     uint8_t last;
@@ -220 +219 @@
     first = pu8Codes[0];
     last = pu8Codes[1-(int)num_opcodes];
-
-    enmType = (first != CR_CMDBLOCKBEGIN_OPCODE) ? CR_UNPACK_BUFFER_TYPE_GENERIC : CR_UNPACK_BUFFER_TYPE_CMDBLOCK_BEGIN;
-
-    if (last != CR_CMDBLOCKEND_OPCODE)
-        return enmType;
-
-    /* last is CMDBLOCKEND*/
-    return (enmType == CR_UNPACK_BUFFER_TYPE_CMDBLOCK_BEGIN) ? CR_UNPACK_BUFFER_TYPE_GENERIC : CR_UNPACK_BUFFER_TYPE_CMDBLOCK_END;
+    
+    switch (last)
+    {
+        case CR_CMDBLOCKFLUSH_OPCODE:
+            return CR_UNPACK_BUFFER_TYPE_CMDBLOCK_FLUSH;
+        case CR_CMDBLOCKEND_OPCODE:
+            return (first == CR_CMDBLOCKBEGIN_OPCODE) ? CR_UNPACK_BUFFER_TYPE_GENERIC : CR_UNPACK_BUFFER_TYPE_CMDBLOCK_END;
+        default:
+            return (first != CR_CMDBLOCKBEGIN_OPCODE) ? CR_UNPACK_BUFFER_TYPE_GENERIC : CR_UNPACK_BUFFER_TYPE_CMDBLOCK_BEGIN;
+    } 
 }
 
@@ -288 +289 @@
             case CR_CMDBLOCKBEGIN_OPCODE:
             case CR_CMDBLOCKEND_OPCODE:
+            case CR_CMDBLOCKFLUSH_OPCODE:
             case CR_NOP_OPCODE:
                 INCR_DATA_PTR_NO_ARGS( );