Changeset 40691 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Mar 28, 2012 3:48:51 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77147

Message:

crOpenGL: basics for using multiple contexts on host

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server.h (modified) (1 diff)
• crserverlib/server_boundsinfo.c (modified) (3 diffs)
• crserverlib/server_config.c (modified) (3 diffs)
• crserverlib/server_lists.c (modified) (2 diffs)
• crserverlib/server_main.c (modified) (25 diffs)
• crserverlib/server_misc.c (modified) (1 diff)
• crserverlib/server_projmatrix.c (modified) (6 diffs)
• crserverlib/server_stream.c (modified) (4 diffs)
• crserverlib/server_viewport.c (modified) (2 diffs)
• render/renderspu.c (modified) (1 diff)
• render/renderspu.h (modified) (2 diffs)
• render/renderspu_wgl.c (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -82 +82 @@
 } CRServerProgram;
 
-typedef struct {
-    char   *pszDpyName;
-    GLint   visualBits; 
-    int32_t internalID;
-} CRCreateInfo_t;
-
 void crServerSetVBoxConfiguration();
 void crServerSetVBoxConfigurationHGCM();

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

@@ -265 +265 @@
 
         if (!mural->viewportValidated) {
-                crServerComputeViewportBounds(&(cr_server.curClient->currentCtx->viewport),
+                crServerComputeViewportBounds(&(cr_server.curClient->currentCtxInfo->pContext->viewport),
                                                                                                                                         mural);
         }
@@ -292 +292 @@
                                 {
                                         mural->curExtent = p->id;
-                                        if (cr_server.run_queue->client->currentCtx) {
+                                        if (cr_server.run_queue->client->currentCtxInfo && cr_server.run_queue->client->currentCtxInfo->pContext) {
                                                 crServerSetOutputBounds( mural, mural->curExtent );
                                         }
@@ -315 +315 @@
                         {
                                 mural->curExtent = i;
-                                if (cr_server.run_queue->client->currentCtx) {
+                                if (cr_server.run_queue->client->currentCtxInfo && cr_server.run_queue->client->currentCtxInfo->pContext) {
                                         crServerSetOutputBounds( mural, i );
                                 }

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

@@ -41 +41 @@
     cr_server.num_overlap_intens = 0;
     cr_server.overlap_intens = 0;
-    cr_server.SpuContext = 0;
+    crMemset(&cr_server.MainContextInfo, 0, sizeof (cr_server.MainContextInfo));
 
     crMatrixInit(&cr_server.viewMatrix[0]);
@@ -219 +219 @@
                                             cr_server.tcpip_port,
                                             cr_server.mtu, 0);
-        newClient->currentCtx = cr_server.DummyContext;
+        newClient->currentCtxInfo = &cr_server.MainContextInfo;
         crServerAddToRunQueue(newClient);
 
@@ -293 +293 @@
                                             cr_server.tcpip_port,
                                             cr_server.mtu, 0);
-        newClient->currentCtx = cr_server.DummyContext;
+        newClient->currentCtxInfo = &cr_server.MainContextInfo;
         crServerAddToRunQueue(newClient);
 

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

@@ -80 +80 @@
     list = TranslateListID( list );
 
-    if (cr_server.curClient->currentCtx->lists.mode == 0) {
+    if (cr_server.curClient->currentCtxInfo->pContext->lists.mode == 0) {
         /* we're not compiling, so execute the list now */
         /* Issue the list as-is */
@@ -208 +208 @@
     }
 
-    if (cr_server.curClient->currentCtx->lists.mode == 0) {
+    if (cr_server.curClient->currentCtxInfo->pContext->lists.mode == 0) {
         /* we're not compiling, so execute the list now */
         /* Issue the list as-is */

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

@@ -109 +109 @@
 
 
-static void deleteContextCallback( void *data )
-{
-    CRContext *c = (CRContext *) data;
-    crStateDestroyContext(c);
+static void deleteContextInfoCallback( void *data )
+{
+    CRContextInfo *c = (CRContextInfo *) data;
+    crStateDestroyContext(c->pContext);
+    if (c->CreateInfo.pszDpyName)
+        crFree(c->CreateInfo.pszDpyName);
+    crFree(c);
 }
 
@@ -144 +147 @@
 
     /* Free all context info */
-    crFreeHashtable(cr_server.contextTable, deleteContextCallback);
+    crFreeHashtable(cr_server.contextTable, deleteContextInfoCallback);
 
     /* Free context/window creation info */
-    crFreeHashtable(cr_server.pContextCreateInfoTable, crServerCreateInfoDeleteCB);
     crFreeHashtable(cr_server.pWindowCreateInfoTable, crServerCreateInfoDeleteCB);
 
@@ -275 +277 @@
 #endif
 
+#ifndef DEBUG_misha
+    cr_server.bUseMultipleContexts = GL_FALSE;
+#else
+    cr_server.bUseMultipleContexts = GL_FALSE;
+#endif
+
+    if (cr_server.bUseMultipleContexts)
+    {
+        crInfo("Info: using multiple contexts!");
+        crDebug("Debug: using multiple contexts!");
+    }
+
     cr_server.firstCallCreateContext = GL_TRUE;
     cr_server.firstCallMakeCurrent = GL_TRUE;
@@ -298 +312 @@
      */
     cr_server.contextTable = crAllocHashtable();
-    cr_server.DummyContext = crStateCreateContext( &cr_server.limits,
+    cr_server.MainContextInfo.pContext = crStateCreateContext( &cr_server.limits,
                                                    CR_RGB_BIT | CR_DEPTH_BIT, NULL );
-    cr_server.curClient->currentCtx = cr_server.DummyContext;
+    cr_server.curClient->currentCtxInfo = &cr_server.MainContextInfo;
 
     crServerInitDispatch();
@@ -334 +348 @@
 #endif
 
+#ifndef DEBUG_misha
+    cr_server.bUseMultipleContexts = GL_FALSE;
+#else
+    cr_server.bUseMultipleContexts = GL_FALSE;
+#endif
+
+    if (cr_server.bUseMultipleContexts)
+    {
+        crInfo("Info: using multiple contexts!");
+        crDebug("Debug: using multiple contexts!");
+    }
+
     crNetInit(crServerRecv, crServerClose);
 
@@ -341 +367 @@
     cr_server.bIsInLoadingState = GL_FALSE;
     cr_server.bIsInSavingState  = GL_FALSE;
+
 
     cr_server.pCleanupClient = NULL;
@@ -367 +394 @@
      */
     cr_server.contextTable = crAllocHashtable();
-    cr_server.DummyContext = crStateCreateContext( &cr_server.limits,
+    cr_server.MainContextInfo.pContext = crStateCreateContext( &cr_server.limits,
                                                    CR_RGB_BIT | CR_DEPTH_BIT, NULL );
-    cr_server.pContextCreateInfoTable = crAllocHashtable();
+//    cr_server.pContextCreateInfoTable = crAllocHashtable();
     cr_server.pWindowCreateInfoTable = crAllocHashtable();
 
@@ -402 +429 @@
 
     newClient->spu_id = 0;
-    newClient->currentCtx = cr_server.DummyContext;
+    newClient->currentCtxInfo = &cr_server.MainContextInfo;
     newClient->currentContextNumber = -1;
     newClient->conn = crNetAcceptClient(cr_server.protocol, NULL,
@@ -686 +713 @@
 static void crVBoxServerSaveCreateInfoCB(unsigned long key, void *data1, void *data2)
 {
-    CRCreateInfo_t *pCreateInfo = (CRCreateInfo_t *) data1;
+    CRCreateInfo_t *pCreateInfo = (CRCreateInfo_t *)data1;
     PSSMHANDLE pSSM = (PSSMHANDLE) data2;
     int32_t rc;
@@ -705 +732 @@
 }
 
+static void crVBoxServerSaveCreateInfoFromCtxInfoCB(unsigned long key, void *data1, void *data2)
+{
+    CRContextInfo *pContextInfo = (CRContextInfo *)data1;
+    CRCreateInfo_t *pCreateInfo = &pContextInfo->CreateInfo;
+    crVBoxServerSaveCreateInfoCB(key, pCreateInfo, data2);
+}
+
 static void crVBoxServerSyncTextureCB(unsigned long key, void *data1, void *data2)
 {
@@ -716 +750 @@
 static void crVBoxServerSaveContextStateCB(unsigned long key, void *data1, void *data2)
 {
-    CRContext *pContext = (CRContext *) data1;
+    CRContextInfo *pContextInfo = (CRContextInfo *) data1;
+    CRContext *pContext = pContextInfo->pContext;
     PSSMHANDLE pSSM = (PSSMHANDLE) data2;
     int32_t rc;
@@ -732 +767 @@
     {
         unsigned long id;
-        if (!crHashtableGetDataKey(cr_server.contextTable, pContext, &id))
+        if (!crHashtableGetDataKey(cr_server.contextTable, pContextInfo, &id))
         {
             crWarning("No client id for server ctx %d", pContext->id);
@@ -786 +821 @@
 
     /* Save rendering contexts creation info */
-    ui32 = crHashtableNumElements(cr_server.pContextCreateInfoTable);
+    ui32 = crHashtableNumElements(cr_server.contextTable);
     rc = SSMR3PutU32(pSSM, (uint32_t) ui32);
     AssertRCReturn(rc, rc);
-    crHashtableWalk(cr_server.pContextCreateInfoTable, crVBoxServerSaveCreateInfoCB, pSSM);
+    crHashtableWalk(cr_server.contextTable, crVBoxServerSaveCreateInfoFromCtxInfoCB, pSSM);
 
 #ifdef CR_STATE_NO_TEXTURE_IMAGE_STORE
@@ -855 +890 @@
             AssertRCReturn(rc, rc);
 
-            if (pClient->currentCtx && pClient->currentContextNumber>=0)
+            if (pClient->currentCtxInfo && pClient->currentCtxInfo->pContext && pClient->currentContextNumber>=0)
             {
-                b = crHashtableGetDataKey(cr_server.contextTable, pClient->currentCtx, &key);
+                b = crHashtableGetDataKey(cr_server.contextTable, pClient->currentCtxInfo, &key);
                 CRASSERT(b);
                 rc = SSMR3PutMem(pSSM, &key, sizeof(key));
@@ -878 +913 @@
 }
 
+static DECLCALLBACK(CRContext*) crVBoxServerGetContextCB(void* pvData)
+{
+    CRContextInfo* pContextInfo = (CRContextInfo*)pvData;
+    CRASSERT(pContextInfo);
+    CRASSERT(pContextInfo->pContext);
+    return pContextInfo->pContext;
+}
+
 DECLEXPORT(int32_t) crVBoxServerLoadState(PSSMHANDLE pSSM, uint32_t version)
 {
@@ -915 +958 @@
         char psz[200];
         GLint ctxID;
+        CRContextInfo* pContextInfo;
         CRContext* pContext;
 
@@ -932 +976 @@
         CRASSERT((int64_t)ctxID == (int64_t)key);
 
-        pContext = (CRContext*) crHashtableSearch(cr_server.contextTable, key);
-        CRASSERT(pContext);
+        pContextInfo = (CRContextInfo*) crHashtableSearch(cr_server.contextTable, key);
+        CRASSERT(pContextInfo);
+        CRASSERT(pContextInfo->pContext);
+        pContext = pContextInfo->pContext;
         pContext->shared->id=-1;
     }
@@ -940 +986 @@
     for (ui=0; ui<uiNumElems; ++ui)
     {
+        CRContextInfo* pContextInfo;
         CRContext *pContext;
 
@@ -945 +992 @@
         AssertRCReturn(rc, rc);
 
-        pContext = (CRContext*) crHashtableSearch(cr_server.contextTable, key);
-        CRASSERT(pContext);
-
-        rc = crStateLoadContext(pContext, cr_server.contextTable, pSSM);
+        pContextInfo = (CRContextInfo*) crHashtableSearch(cr_server.contextTable, key);
+        CRASSERT(pContextInfo);
+        CRASSERT(pContextInfo->pContext);
+        pContext = pContextInfo->pContext;
+
+        rc = crStateLoadContext(pContext, cr_server.contextTable, crVBoxServerGetContextCB, pSSM);
         AssertRCReturn(rc, rc);
     }
@@ -1056 +1105 @@
 
             pClient->currentContextNumber = -1;
-            pClient->currentCtx = cr_server.DummyContext;
+            pClient->currentCtxInfo = &cr_server.MainContextInfo;
             pClient->currentMural = NULL;
             pClient->currentWindow = -1;
@@ -1062 +1111 @@
             cr_server.curClient = pClient;
 
-            if (client.currentCtx && client.currentContextNumber>=0)
+            if (client.currentCtxInfo && client.currentContextNumber>=0)
             {
                 rc = SSMR3GetMem(pSSM, &ctxID, sizeof(ctxID));
                 AssertRCReturn(rc, rc);
-                client.currentCtx = (CRContext*) crHashtableSearch(cr_server.contextTable, ctxID);
-                CRASSERT(client.currentCtx);
+                client.currentCtxInfo = (CRContextInfo*) crHashtableSearch(cr_server.contextTable, ctxID);
+                CRASSERT(client.currentCtxInfo);
+                CRASSERT(client.currentCtxInfo->pContext);
                 //pClient->currentCtx = client.currentCtx;
                 //pClient->currentContextNumber = ctxID;
@@ -1094 +1144 @@
             crServerDispatchMakeCurrent(winID, 0, ctxID);
 
-            crHashtableWalk(client.currentCtx->shared->textureTable, crVBoxServerSyncTextureCB, client.currentCtx);
-
-            crStateTextureObjectDiff(client.currentCtx, NULL, NULL, &client.currentCtx->texture.base1D, GL_TRUE);
-            crStateTextureObjectDiff(client.currentCtx, NULL, NULL, &client.currentCtx->texture.base2D, GL_TRUE);
-            crStateTextureObjectDiff(client.currentCtx, NULL, NULL, &client.currentCtx->texture.base3D, GL_TRUE);
+            crHashtableWalk(client.currentCtxInfo->pContext->shared->textureTable, crVBoxServerSyncTextureCB, client.currentCtxInfo->pContext);
+
+            crStateTextureObjectDiff(client.currentCtxInfo->pContext, NULL, NULL, &client.currentCtxInfo->pContext->texture.base1D, GL_TRUE);
+            crStateTextureObjectDiff(client.currentCtxInfo->pContext, NULL, NULL, &client.currentCtxInfo->pContext->texture.base2D, GL_TRUE);
+            crStateTextureObjectDiff(client.currentCtxInfo->pContext, NULL, NULL, &client.currentCtxInfo->pContext->texture.base3D, GL_TRUE);
 #ifdef CR_ARB_texture_cube_map
-            crStateTextureObjectDiff(client.currentCtx, NULL, NULL, &client.currentCtx->texture.baseCubeMap, GL_TRUE);
+            crStateTextureObjectDiff(client.currentCtxInfo->pContext, NULL, NULL, &client.currentCtxInfo->pContext->texture.baseCubeMap, GL_TRUE);
 #endif
 #ifdef CR_NV_texture_rectangle
             //@todo this doesn't work as expected
-            //crStateTextureObjectDiff(client.currentCtx, NULL, NULL, &client.currentCtx->texture.baseRect, GL_TRUE);
+            //crStateTextureObjectDiff(client.currentCtxInfo->pContext, NULL, NULL, &client.currentCtxInfo->pContext->texture.baseRect, GL_TRUE);
 #endif
             /*cr_server.head_spu->dispatch_table.Materialfv(GL_FRONT_AND_BACK, GL_AMBIENT, amb);
@@ -1141 +1191 @@
                 tmpCtx = crStateCreateContext(NULL, createInfo->visualBits, NULL);
                 CRASSERT(tmpCtx);
-                crStateDiffContext(tmpCtx, client.currentCtx);
+                crStateDiffContext(tmpCtx, client.currentCtxInfo->pContext);
                 crStateDestroyContext(tmpCtx);*/
             }
@@ -1264 +1314 @@
         {
             cr_server.curClient = cr_server.clients[i];
-            if (cr_server.curClient->currentCtx
-                && (cr_server.curClient->currentCtx->buffer.pFrontImg || cr_server.curClient->currentCtx->buffer.pBackImg)
+            if (cr_server.curClient->currentCtxInfo
+                && cr_server.curClient->currentCtxInfo->pContext
+                && (cr_server.curClient->currentCtxInfo->pContext->buffer.pFrontImg || cr_server.curClient->currentCtxInfo->pContext->buffer.pBackImg)
                 && cr_server.curClient->currentMural
                 && cr_server.curClient->currentMural->screenId == sIndex
-                && cr_server.curClient->currentCtx->buffer.storedHeight == h
-                && cr_server.curClient->currentCtx->buffer.storedWidth == w)
+                && cr_server.curClient->currentCtxInfo->pContext->buffer.storedHeight == h
+                && cr_server.curClient->currentCtxInfo->pContext->buffer.storedWidth == w)
             {
                 int clientWindow = cr_server.curClient->currentWindow;
@@ -1279 +1330 @@
                 }
 
-                crStateApplyFBImage(cr_server.curClient->currentCtx);
+                crStateApplyFBImage(cr_server.curClient->currentCtxInfo->pContext);
             }
         }

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

@@ -263 +263 @@
     if (pCreateInfo->pszDpyName)
         crFree(pCreateInfo->pszDpyName);
+    crFree(pCreateInfo);
 }
 

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

@@ -32 +32 @@
     else {
         /* we have a quad-buffered window and we're watching glDrawBuffer */
-        GLenum drawBuffer = cr_server.curClient->currentCtx->buffer.drawBuffer;
+        GLenum drawBuffer = cr_server.curClient->currentCtxInfo->pContext->buffer.drawBuffer;
         int eye = drawBuffer == GL_BACK_RIGHT || drawBuffer == GL_FRONT_RIGHT
             || drawBuffer == GL_RIGHT;
@@ -42 +42 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchLoadMatrixf( const GLfloat *m )
 {
-    const GLenum matMode = cr_server.curClient->currentCtx->transform.matrixMode;
+    const GLenum matMode = cr_server.curClient->currentCtxInfo->pContext->transform.matrixMode;
     const CRMuralInfo *mural = cr_server.curClient->currentMural;
 
@@ -59 +59 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchLoadMatrixd( const GLdouble *m )
 {
-    const GLenum matMode = cr_server.curClient->currentCtx->transform.matrixMode;
+    const GLenum matMode = cr_server.curClient->currentCtxInfo->pContext->transform.matrixMode;
     const CRMuralInfo *mural = cr_server.curClient->currentMural;
 
@@ -76 +76 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchMultMatrixf( const GLfloat *m )
 {
-    const GLenum matMode = cr_server.curClient->currentCtx->transform.matrixMode;
+    const GLenum matMode = cr_server.curClient->currentCtxInfo->pContext->transform.matrixMode;
 
     if (matMode == GL_PROJECTION && cr_server.projectionOverride) {
@@ -93 +93 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchMultMatrixd( const GLdouble *m )
 {
-    const GLenum matMode = cr_server.curClient->currentCtx->transform.matrixMode;
+    const GLenum matMode = cr_server.curClient->currentCtxInfo->pContext->transform.matrixMode;
 
     if (matMode == GL_PROJECTION && cr_server.projectionOverride) {
@@ -111 +111 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchLoadIdentity( void )
 {
-    const GLenum matMode = cr_server.curClient->currentCtx->transform.matrixMode;
+    const GLenum matMode = cr_server.curClient->currentCtxInfo->pContext->transform.matrixMode;
     const CRMuralInfo *mural = cr_server.curClient->currentMural;
 

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

@@ -26 +26 @@
                                                                                  cr_server.mtu, 1 );
 
-        newClient->currentCtx = cr_server.DummyContext;
+        newClient->currentCtxInfo = &cr_server.MainContextInfo;
 
         /* add to array */
@@ -293 +293 @@
 crServerClientInBeginEnd(const CRClient *client)
 {
-    if (client->currentCtx &&
-            (client->currentCtx->lists.currentIndex != 0 ||
-             client->currentCtx->current.inBeginEnd ||
-             client->currentCtx->occlusion.currentQueryObject)) {
+    if (client->currentCtxInfo
+            && client->currentCtxInfo->pContext
+            && (client->currentCtxInfo->pContext->lists.currentIndex != 0 ||
+             client->currentCtxInfo->pContext->current.inBeginEnd ||
+             client->currentCtxInfo->pContext->occlusion.currentQueryObject)) {
         return GL_TRUE;
     }
@@ -543 +544 @@
              int clientWindow = cr_server.curClient->currentWindow;
              int clientContext = cr_server.curClient->currentContextNumber;
-             if (clientWindow && clientWindow != cr_server.currentWindow) {
+             CRContextInfo *clientCtxInfo = cr_server.curClient->currentCtxInfo;
+             if (clientCtxInfo != cr_server.currentCtxInfo) {
                  crServerDispatchMakeCurrent(clientWindow, 0, clientContext);
                  /*
@@ -550 +552 @@
              }
         }
-
-        crStateMakeCurrent( cr_server.curClient->currentCtx );
 #endif
 

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

@@ -240 +240 @@
         }
         else
-                projMatrix = cr_server.curClient->currentCtx->transform.projectionStack.top;
+                projMatrix = cr_server.curClient->currentCtxInfo->pContext->transform.projectionStack.top;
 
         cr_server.head_spu->dispatch_table.PushAttrib( GL_TRANSFORM_BIT );
@@ -254 +254 @@
 crServerApplyViewMatrix(const CRmatrix *view)
 {
-        const CRmatrix *modelview = cr_server.curClient->currentCtx->transform.modelViewStack.top;
+        const CRmatrix *modelview = cr_server.curClient->currentCtxInfo->pContext->transform.modelViewStack.top;
 
         cr_server.head_spu->dispatch_table.PushAttrib( GL_TRANSFORM_BIT );

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -350 +350 @@
 }
 
-static void
+void
 RENDER_APIENTRY renderspuWindowDestroy( GLint win )
 {

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -60 +60 @@
     const char *displayName;
 #if defined(WINDOWS)
-    HDC device_context;
+//    HDC device_context;
 #elif defined(DARWIN)
 # ifndef VBOX_WITH_COCOA_QT
@@ -317 +317 @@
 
 extern GLint RENDER_APIENTRY renderspuWindowCreate( const char *dpyName, GLint visBits );
+void RENDER_APIENTRY renderspuWindowDestroy( GLint win );
 extern GLint RENDER_APIENTRY renderspuCreateContext( const char *dpyname, GLint visBits, GLint shareCtx );
 extern void RENDER_APIENTRY renderspuMakeCurrent(GLint crWindow, GLint nativeWindow, GLint ctx);

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c

@@ -387 +387 @@
     /* In the windows world, we need a window before a context.
      * Use the device_context as a marker to do just that */
-    visual->device_context = 0;
 
     return TRUE;
@@ -1163 +1162 @@
 }
 
+static GLboolean renderspuChkActivateSharedContext(ContextInfo *sharedContext)
+{
+    GLint crWindow;
+    WindowInfo *window;
+
+    if (sharedContext->hRC)
+        return GL_TRUE;
+
+    CRASSERT(sharedContext->id);
+
+    if (sharedContext->shared)
+        renderspuChkActivateSharedContext(sharedContext->shared);
+
+    crWindow = renderspuWindowCreate(sharedContext->visual->displayName, sharedContext->visual->visAttribs);
+    if (!crWindow)
+    {
+        crError("renderspuChkActivateSharedContext: renderspuWindowCreate failed!");
+        return GL_FALSE;
+    }
+
+    window = (WindowInfo *) crHashtableSearch(render_spu.windowTable, crWindow);
+    if (!window)
+    {
+        crError("renderspuChkActivateSharedContext: crHashtableSearch failed!");
+        renderspuWindowDestroy(crWindow);
+        return GL_FALSE;
+    }
+
+    CRASSERT(window->device_context);
+
+    crDebug( "Render SPU: renderspuChkActivateSharedContext: made the DC: 0x%x", window->device_context );
+
+    sharedContext->hRC = render_spu.ws.wglCreateContext(window->device_context);
+    if (!sharedContext->hRC)
+    {
+        crError( "Render SPU: (renderspuChkActivateSharedContext) Couldn't create the context for the window (error 0x%x)", GetLastError() );
+        renderspuWindowDestroy(crWindow);
+        return GL_FALSE;
+    }
+
+    sharedContext->currentWindow = window;
+
+    return GL_TRUE;
+}
+
 void renderspu_SystemMakeCurrent( WindowInfo *window, GLint nativeWindow, ContextInfo *context )
 {
@@ -1197 +1241 @@
              * the HDC values between processes.. FIXME!
              */
+            if (context->shared)
+            {
+                /* first make sure we have shared context created */
+                renderspuChkActivateSharedContext(context->shared);
+            }
+
             window->nativeWindow = (HDC) nativeWindow;
             if (context->hRC == 0) {
@@ -1205 +1255 @@
                 }
             }
+
+            if (context->shared
+                    && context->shared->hRC
+                    && context->hRC)
+            {
+                /* share lists */
+                render_spu.ws.wglShareLists(context->shared->hRC, context->hRC);
+            }
+
             render_spu.ws.wglMakeCurrent( window->nativeWindow, context->hRC );
         }
         else
         {
-            if (!context->visual->device_context) {
-                context->visual->device_context = GetDC( window->hWnd );
-
-                crDebug( "Render SPU: MakeCurrent made the DC: 0x%x", context->visual->device_context );
-
-                if ( !bSetupPixelFormat( context->visual->device_context, context->visual->visAttribs ) )
+            if (!context->hRC) {
+                if (context->shared)
                 {
-                    crError( "Render SPU: (MakeCurrent) Couldn't set up the device context!  Yikes!" );
+                    /* first make sure we have shared context created */
+                    renderspuChkActivateSharedContext(context->shared);
                 }
-            }
-
-            if (!context->hRC) {
-                context->hRC = render_spu.ws.wglCreateContext(context->visual->device_context);
+
+                context->hRC = render_spu.ws.wglCreateContext(window->device_context);
                 if (!context->hRC)
                 {
                     crError( "Render SPU: (MakeCurrent) Couldn't create the context for the window (error 0x%x)", GetLastError() );
+                }
+
+                if (context->shared
+                        && context->shared->hRC
+                        && context->hRC)
+                {
+                    /* share lists */
+                    render_spu.ws.wglShareLists(context->shared->hRC, context->hRC);
                 }