Changeset 39061 in vbox

Timestamp:

Oct 20, 2011 3:53:11 PM (13 years ago)

Author:

vboxsync

Message:

back out r74471 since it causes crashes

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu_context.c (modified) (4 diffs)
• packspu_init.c (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c

@@ -173 +173 @@
     /* Fill in the new context info */
     /* XXX fix-up sharedCtx param here */
-#ifdef CR_DUP_CTXSTATE
     pack_spu.context[slot].clientState = crStateCreateContext(NULL, visual, NULL);
-#else
-    pack_spu.context[slot].clientState = crStateGetCurrent();
-#endif
-    CRASSERT(pack_spu.context[slot].clientState);
     pack_spu.context[slot].clientState->bufferobject.retainBufferData = GL_TRUE;
     pack_spu.context[slot].serverCtx = serverCtx;
@@ -207 +202 @@
         crPackDestroyContext( context->serverCtx );
 
-#ifdef CR_DUP_CTXSTATE
     crStateDestroyContext( context->clientState );
-#endif
 
     context->clientState = NULL;
@@ -263 +256 @@
 
         crPackSetContext( thread->packer );
-#ifdef CR_DUP_CTXSTATE
         crStateMakeCurrent( newCtx->clientState );
-#else
-        CRASSERT(newCtx->clientState==crStateGetCurrent());
-#endif
         //crStateSetCurrentPointers(newCtx->clientState, &thread->packer->current);
         serverCtx = pack_spu.context[slot].serverCtx;
@@ -273 +262 @@
     else {
         thread->currentContext = NULL;
-#ifdef CR_DUP_CTXSTATE
         crStateMakeCurrent( NULL );
-#endif
         newCtx = NULL;
         serverCtx = 0;

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c

@@ -57 +57 @@
 
     packspuCreateFunctions();
-#ifdef CR_DUP_CTXSTATE
     crStateInit();
-#endif
 
     return &pack_functions;