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

Timestamp:

Nov 10, 2011 3:40:22 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: flush on glEnd if some begin-end data was sent to host already - fix Win8+WinSAT halt

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_pack.h (modified) (6 diffs)
• packer/pack_beginend.c (modified) (4 diffs)
• packer/pack_init.c (modified) (1 diff)

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

@@ -51 +51 @@
 typedef void (*CRPackErrorHandlerFunc)(int line, const char *file, GLenum error, const char *info);
 
-
+typedef enum
+{
+    CRPackBeginEndStateNone = 0, /* not in begin end */
+    CRPackBeginEndStateStarted,       /* begin issued */
+    CRPackBeginEndStateFlushDone /* begin issued & buffer flash is done thus part of commands is issued to host */
+} CRPackBeginEndState;
 /**
  * Packer context
@@ -63 +68 @@
     CRPackErrorHandlerFunc Error;
     CRCurrentStatePointers current;
+    CRPackBeginEndState enmBeginEndState;
     GLvectorf bounds_min, bounds_max;
     int updateBBOX;
@@ -203 +209 @@
       pc->Flush( pc->flush_arg );                                   \
       CRASSERT(crPackCanHoldOpcode( pc, 1, (len) ) );               \
+      if (pc->enmBeginEndState == CRPackBeginEndStateStarted) {     \
+        pc->enmBeginEndState = CRPackBeginEndStateFlushDone;        \
+      }                                                             \
     }                                                               \
     data_ptr = pc->buffer.data_current;                             \
@@ -218 +227 @@
     CRASSERT( pc->currentBuffer );                                  \
     if ( pc->buffer.holds_BeginEnd && !pc->buffer.in_BeginEnd ) {   \
+      CRASSERT( 0 );  /* should never be here currently */          \
       pc->Flush( pc->flush_arg );                                   \
       pc->buffer.holds_BeginEnd = 0;                                \
@@ -231 +241 @@
     CRASSERT( pc->currentBuffer );                                  \
     if ( pc->buffer.holds_BeginEnd && !pc->buffer.in_BeginEnd ) {   \
+      CRASSERT( 0 );  /* should never be here currently */          \
       pc->Flush( pc->flush_arg );                                   \
       pc->buffer.holds_BeginEnd = 0;                                \
@@ -248 +259 @@
       pc->Flush( pc->flush_arg );                       \
       CRASSERT( crPackCanHoldOpcode( pc, 1, (len) ) );  \
+      if (pc->enmBeginEndState == CRPackBeginEndStateStarted) {     \
+        pc->enmBeginEndState = CRPackBeginEndStateFlushDone;        \
+      }                                                             \
     }                                                   \
     data_ptr = pc->buffer.data_current;                 \

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

@@ -21 +21 @@
     }
     CR_GET_BUFFERED_POINTER( pc, 4 );
+    CRASSERT(pc->enmBeginEndState == CRPackBeginEndStateNone);
+    pc->enmBeginEndState = CRPackBeginEndStateStarted;
     pc->current.begin_data = data_ptr;
     pc->current.begin_op = pc->buffer.opcode_current;
@@ -42 +44 @@
     }
     CR_GET_BUFFERED_POINTER( pc, 4 );
+    CRASSERT(pc->enmBeginEndState == CRPackBeginEndStateNone);
+    pc->enmBeginEndState = CRPackBeginEndStateStarted;
     pc->current.begin_data = data_ptr;
     pc->current.begin_op = pc->buffer.opcode_current;
@@ -58 +62 @@
     WRITE_OPCODE( pc, CR_END_OPCODE );
     pc->buffer.in_BeginEnd = 0;
+    CRASSERT(pc->enmBeginEndState == CRPackBeginEndStateStarted
+            || pc->enmBeginEndState == CRPackBeginEndStateFlushDone);
+    if (pc->enmBeginEndState == CRPackBeginEndStateFlushDone)
+    {
+        pc->Flush( pc->flush_arg );
+    }
+    pc->enmBeginEndState = CRPackBeginEndStateNone;
     CR_UNLOCK_PACKER_CONTEXT(pc);
 }
@@ -69 +80 @@
     WRITE_OPCODE( pc, CR_END_OPCODE );
     pc->buffer.in_BeginEnd = 0;
+    CRASSERT(pc->enmBeginEndState == CRPackBeginEndStateStarted
+            || pc->enmBeginEndState == CRPackBeginEndStateFlushDone);
+    if (pc->enmBeginEndState == CRPackBeginEndStateFlushDone)
+    {
+        pc->Flush( pc->flush_arg );
+    }
     CR_UNLOCK_PACKER_CONTEXT(pc);
 }

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

@@ -29 +29 @@
         crMemZero( pc, sizeof(CRPackContext));
 #endif
+    pc->enmBeginEndState = CRPackBeginEndStateNone;
     pc->swapping = swapping;
     pc->Flush = NULL;