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

Timestamp:

Jan 29, 2014 8:23:21 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: correct way of dealing with CreateInfo

File:

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

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

@@ -29 +29 @@
 
     dpyName = "";
-    if (cr_server.fVisualBitsDefault)
-        visualBits = cr_server.fVisualBitsDefault;
 
     if (shareCtx > 0) {
@@ -46 +44 @@
     pContextInfo->currentMural = NULL;
 
-    pContextInfo->CreateInfo.visualBits = visualBits;
+    pContextInfo->CreateInfo.requestedVisualBits = visualBits;
+
+    if (cr_server.fVisualBitsDefault)
+        visualBits = cr_server.fVisualBitsDefault;
+
+    pContextInfo->CreateInfo.realVisualBits = visualBits;
 
     /* Since the Cr server serialized all incoming clients/contexts into
@@ -53 +56 @@
      */
     if (cr_server.firstCallCreateContext) {
-        cr_server.MainContextInfo.CreateInfo.visualBits = visualBits;
+        cr_server.MainContextInfo.CreateInfo.realVisualBits = visualBits;
         cr_server.MainContextInfo.SpuContext = cr_server.head_spu->dispatch_table.
-            CreateContext(dpyName, cr_server.MainContextInfo.CreateInfo.visualBits, shareCtx);
+            CreateContext(dpyName, cr_server.MainContextInfo.CreateInfo.realVisualBits, shareCtx);
         if (cr_server.MainContextInfo.SpuContext < 0) {
             crWarning("crServerDispatchCreateContext() failed.");
@@ -70 +73 @@
     else {
         /* second or third or ... context */
-        if (!cr_server.bUseMultipleContexts && ((visualBits & cr_server.MainContextInfo.CreateInfo.visualBits) != visualBits)) {
+        if (!cr_server.bUseMultipleContexts && ((visualBits & cr_server.MainContextInfo.CreateInfo.realVisualBits) != visualBits)) {
             int oldSpuContext;
-
+            /* should never be here */
+            CRASSERT(0);
             /* the new context needs new visual attributes */
-            cr_server.MainContextInfo.CreateInfo.visualBits |= visualBits;
+            cr_server.MainContextInfo.CreateInfo.realVisualBits |= visualBits;
             crWarning("crServerDispatchCreateContext requires new visual (0x%x).",
-                    cr_server.MainContextInfo.CreateInfo.visualBits);
+                    cr_server.MainContextInfo.CreateInfo.realVisualBits);
 
             /* Here, we used to just destroy the old rendering context.
@@ -91 +95 @@
             oldSpuContext = cr_server.MainContextInfo.SpuContext;
             cr_server.MainContextInfo.SpuContext = cr_server.head_spu->dispatch_table.
-                CreateContext(dpyName, cr_server.MainContextInfo.CreateInfo.visualBits, cr_server.MainContextInfo.SpuContext);
+                CreateContext(dpyName, cr_server.MainContextInfo.CreateInfo.realVisualBits, cr_server.MainContextInfo.SpuContext);
             /* destroy old rendering context */
             cr_server.head_spu->dispatch_table.DestroyContext(oldSpuContext);
@@ -108 +112 @@
     if (cr_server.bUseMultipleContexts) {
         pContextInfo->SpuContext = cr_server.head_spu->dispatch_table.
-                CreateContext(dpyName, cr_server.MainContextInfo.CreateInfo.visualBits, cr_server.MainContextInfo.SpuContext);
+                CreateContext(dpyName, cr_server.MainContextInfo.CreateInfo.realVisualBits, cr_server.MainContextInfo.SpuContext);
         if (pContextInfo->SpuContext < 0) {
             crWarning("crServerDispatchCreateContext() failed.");
@@ -136 +140 @@
 
         pContextInfo->pContext = newCtx;
-        pContextInfo->CreateInfo.visualBits = visualBits;
+        Assert(pContextInfo->CreateInfo.realVisualBits == visualBits);
         pContextInfo->CreateInfo.externalID = retVal;
         pContextInfo->CreateInfo.pszDpyName = dpyName ? crStrdup(dpyName) : NULL;
@@ -202 +206 @@
     if (cr_server.currentCtxInfo == crCtxInfo)
     {
-        CRMuralInfo *dummyMural = crServerGetDummyMural(cr_server.MainContextInfo.CreateInfo.visualBits);
+        CRMuralInfo *dummyMural = crServerGetDummyMural(cr_server.MainContextInfo.CreateInfo.realVisualBits);
         crServerPerformMakeCurrent(dummyMural, &cr_server.MainContextInfo);
         CRASSERT(cr_server.currentCtxInfo == &cr_server.MainContextInfo);