Changeset 52260 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Aug 4, 2014 11:59:46 AM (11 years ago)

Author:

vboxsync

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

95357

Message:

crOpenGL: proper support of GetErr being called from display list, better error handling

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/GuestHost/OpenGL/include/cr_pack.h (modified) (4 diffs)
• src/VBox/GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/packer/pack_beginend.c (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/packer/pack_lists.c (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/state_tracker/state_lists.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_pack.h

@@ -252 +252 @@
   } while (0)
 
+#define CR_CMDBLOCK_IS_STARTED( pc, op )  CRPACKBLOCKSTATE_IS_OP_STARTED((pc)->u32CmdBlockState, op)
 
 #define CR_CMDBLOCK_BEGIN( pc, op )                                 \
@@ -257 +258 @@
     CR_LOCK_PACKER_CONTEXT(pc);                                     \
     if (!cr_packer_cmd_blocks_enabled) break;                       \
-    if (!CRPACKBLOCKSTATE_IS_STARTED(pc->u32CmdBlockState)) {       \
+    if (!CRPACKBLOCKSTATE_IS_STARTED((pc)->u32CmdBlockState)) {       \
       THREADASSERT( pc );                                           \
-      CRASSERT( pc->currentBuffer );                                \
-      if (!crPackBufferIsEmpty(&pc->buffer)) {                      \
-        if ((*pc->buffer.opcode_start) != CR_NOP_OPCODE) {          \
-          pc->Flush( pc->flush_arg );                               \
-          Assert(crPackCanHoldOpcode( pc, 1, 4 ) );                 \
-          CR_CMDBLOCK_OP( pc, CR_CMDBLOCKBEGIN_OPCODE );            \
+      CRASSERT( (pc)->currentBuffer );                                \
+      if (!crPackBufferIsEmpty(&(pc)->buffer)) {                      \
+        if ((*(pc)->buffer.opcode_start) != CR_NOP_OPCODE) {          \
+          (pc)->Flush( (pc)->flush_arg );                               \
+          Assert(crPackCanHoldOpcode( (pc), 1, 4 ) );                 \
+          CR_CMDBLOCK_OP( (pc), CR_CMDBLOCKBEGIN_OPCODE );            \
         }                                                           \
         else {                                                      \
-          (*pc->buffer.opcode_start) = CR_CMDBLOCKBEGIN_OPCODE;     \
+          (*(pc)->buffer.opcode_start) = CR_CMDBLOCKBEGIN_OPCODE;     \
         }                                                           \
       }                                                             \
       else {                                                        \
-        Assert(crPackCanHoldOpcode( pc, 1, 4 ) );                   \
-        CR_CMDBLOCK_OP( pc, CR_CMDBLOCKBEGIN_OPCODE );              \
+        Assert(crPackCanHoldOpcode( (pc), 1, 4 ) );                   \
+        CR_CMDBLOCK_OP( (pc), CR_CMDBLOCKBEGIN_OPCODE );              \
       }                                                             \
     }                                                               \
-    CRPACKBLOCKSTATE_OP_START(pc->u32CmdBlockState, op);            \
+    Assert(!CRPACKBLOCKSTATE_IS_OP_STARTED((pc)->u32CmdBlockState, op)); \
+    CRPACKBLOCKSTATE_OP_START((pc)->u32CmdBlockState, op);            \
+    Assert(CRPACKBLOCKSTATE_IS_OP_STARTED((pc)->u32CmdBlockState, op)); \
   } while (0)
 
@@ -281 +284 @@
   do {                                                              \
     if (!cr_packer_cmd_blocks_enabled) break;                       \
-    CRPACKBLOCKSTATE_OP_STOP(pc->u32CmdBlockState, op);             \
-    if (!CRPACKBLOCKSTATE_IS_STARTED(pc->u32CmdBlockState)) {       \
+    Assert(CRPACKBLOCKSTATE_IS_OP_STARTED((pc)->u32CmdBlockState, op)); \
+    CRPACKBLOCKSTATE_OP_STOP((pc)->u32CmdBlockState, op);             \
+    Assert(!CRPACKBLOCKSTATE_IS_OP_STARTED((pc)->u32CmdBlockState, op)); \
+    if (!CRPACKBLOCKSTATE_IS_STARTED((pc)->u32CmdBlockState)) {     \
       THREADASSERT( pc );                                           \
-      CRASSERT( pc->currentBuffer );                                \
-      if (!crPackBufferIsEmpty(&pc->buffer)) {                      \
-        if ((*pc->buffer.opcode_start) != CR_CMDBLOCKBEGIN_OPCODE) {\
+      CRASSERT( (pc)->currentBuffer );                              \
+      if (!crPackBufferIsEmpty(&(pc)->buffer)) {                    \
+        if ((*(pc)->buffer.opcode_start) != CR_CMDBLOCKBEGIN_OPCODE) {\
           if ( !crPackCanHoldOpcode( pc, 1, 4 ) ) {                 \
-            pc->Flush( pc->flush_arg );                             \
+            (pc)->Flush( (pc)->flush_arg );                         \
             Assert(crPackCanHoldOpcode( pc, 1, 4 ) );               \
           }                                                         \
           CR_CMDBLOCK_OP( pc, CR_CMDBLOCKEND_OPCODE );              \
-          pc->Flush( pc->flush_arg );                               \
+          (pc)->Flush( (pc)->flush_arg );                           \
         }                                                           \
         else {                                                      \
-          (*pc->buffer.opcode_start) = CR_NOP_OPCODE;               \
+          (*(pc)->buffer.opcode_start) = CR_NOP_OPCODE;             \
         }                                                           \
       }                                                             \
@@ -301 +306 @@
         Assert(crPackCanHoldOpcode( pc, 1, 4 ) );                   \
         CR_CMDBLOCK_OP( pc, CR_CMDBLOCKEND_OPCODE );                \
-        pc->Flush( pc->flush_arg );                                 \
+        (pc)->Flush( pc->flush_arg );                               \
       }                                                             \
     }                                                               \

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -356 +356 @@
 
     GLboolean fCrCmdEnabled;
+
+    GLboolean fProcessingPendedCommands;
 
     int numClients;

trunk/src/VBox/GuestHost/OpenGL/packer/pack_beginend.c

@@ -13 +13 @@
     unsigned char *data_ptr;
     (void) pc;
+
+    if (CR_CMDBLOCK_IS_STARTED(pc, CRPACKBLOCKSTATE_OP_BEGIN))
+    {
+        WARN(("recursive begin?"));
+        return;
+    }
 
     CR_CMDBLOCK_BEGIN( pc, CRPACKBLOCKSTATE_OP_BEGIN );

trunk/src/VBox/GuestHost/OpenGL/packer/pack_lists.c

@@ -64 +64 @@
     unsigned char *data_ptr;
     (void) pc;
+
+    if (CR_CMDBLOCK_IS_STARTED(pc, CRPACKBLOCKSTATE_OP_NEWLIST))
+    {
+        WARN(("recursive NewList?"));
+        return;
+    }
+
     CR_CMDBLOCK_BEGIN( pc, CRPACKBLOCKSTATE_OP_NEWLIST );
     CR_GET_BUFFERED_POINTER_NO_BEGINEND_FLUSH( pc, 16, GL_FALSE );

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_lists.c

@@ -174 +174 @@
     CRStateBits *sb = GetCurrentBits();
     CRbitvalue *bitID=g->bitid, *negbitID=g->neg_bitid;
+
+    CRASSERT(g_bVBoxEnableDiffOnMakeCurrent);
 
     if (CHECKDIRTY(sb->buffer.dirty, negbitID))