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

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

File:

• trunk/src/VBox/GuestHost/OpenGL/include/cr_pack.h (modified) (6 diffs)

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;                 \