Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c
===================================================================
--- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c	(revision 51318)
+++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c	(revision 51319)
@@ -503,8 +503,6 @@
 
             if (thread->currentContext && newCtx != thread->currentContext && thread->currentContext->fCheckZerroVertAttr)
-            {
                 crStateCurrentRecoverNew(thread->currentContext->clientState, &thread->packer->current);
-                crStateResetCurrentPointers(&thread->packer->current);
-            }
+
             thread->currentContext = newCtx;
             crPackSetContext( thread->packer );
Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_net.c
===================================================================
--- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_net.c	(revision 51318)
+++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_net.c	(revision 51319)
@@ -132,8 +132,5 @@
 
     if (ctx && ctx->fCheckZerroVertAttr)
-    {
         crStateCurrentRecoverNew(ctx->clientState, &thread->packer->current);
-        crStateResetCurrentPointers(&thread->packer->current);
-    }
 
     /* We're done packing into the current buffer, unbind it */
Index: /trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_client.c
===================================================================
--- /trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_client.c	(revision 51318)
+++ /trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_client.c	(revision 51319)
@@ -1665,5 +1665,4 @@
 
         crStateCurrentRecoverNew(g, current);
-        crStateResetCurrentPointers(current);
 
         crMemcpy(pZva, &g->current.vertexAttrib[0][0], sizeof (*pZva) * 4);
Index: /trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_current.py
===================================================================
--- /trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_current.py	(revision 51318)
+++ /trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_current.py	(revision 51319)
@@ -477,3 +477,4 @@
         print '\t\tcurrent->changed%s = 0;' % k
         print '\t}'
+print '\tcrStateResetCurrentPointers(current);'
 print '}'