Changeset 45616 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.c

Timestamp:

Apr 18, 2013 5:44:22 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: 1.work around 4.2.12 saved state issues, 2. saved state fixes

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.c (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.c

@@ -307 +307 @@
     crStateSwitchPrepare(cr_server.bUseMultipleContexts ? NULL : ctx, oldCtx, idDrawFBO, idReadFBO);
 
-    /*
-    crDebug("**** %s client %d  curCtx=%d curWin=%d", __func__,
-                    cr_server.curClient->number, ctxPos, window);
-    */
-    cr_server.curClient->currentContextNumber = context;
-    cr_server.curClient->currentCtxInfo = ctxInfo;
-    cr_server.curClient->currentMural = mural;
-    cr_server.curClient->currentWindow = window;
-
-    CRASSERT(cr_server.curClient->currentCtxInfo);
-    CRASSERT(cr_server.curClient->currentCtxInfo->pContext);
+    if (cr_server.curClient)
+    {
+        /*
+        crDebug("**** %s client %d  curCtx=%d curWin=%d", __func__,
+                        cr_server.curClient->number, ctxPos, window);
+        */
+        cr_server.curClient->currentContextNumber = context;
+        cr_server.curClient->currentCtxInfo = ctxInfo;
+        cr_server.curClient->currentMural = mural;
+        cr_server.curClient->currentWindow = window;
+
+        CRASSERT(cr_server.curClient->currentCtxInfo);
+        CRASSERT(cr_server.curClient->currentCtxInfo->pContext);
+    }
 
     /* This is a hack to force updating the 'current' attribs */
@@ -401 +404 @@
 
     if (!ctx->framebufferobject.drawFB
-            && (ctx->buffer.drawBuffer == GL_FRONT || ctx->buffer.drawBuffer == GL_FRONT_LEFT))
+            && (ctx->buffer.drawBuffer == GL_FRONT || ctx->buffer.drawBuffer == GL_FRONT_LEFT)
+            && cr_server.curClient)
         cr_server.curClient->currentMural->bFbDraw = GL_TRUE;