Changeset 41971 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jun 29, 2012 12:31:04 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: report visual bits superset to avoid host context recreation misbehave

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• icd_drv.c (modified) (3 diffs)
• wgl.c (modified) (5 diffs)

trunk/src/VBox/Additions/common/crOpenGL/icd_drv.c

@@ -39 +39 @@
 } };
 
+/* Currently host part will misbehave re-creating context with proper visual bits
+ * if contexts with alternative visual bits is requested.
+ * For now we just report a superset of all visual bits to avoid that.
+ * Better to it on the host side as well?
+ * We could also implement properly multiple pixel formats,
+ * which should be done by implementing offscreen rendering or multiple host contexts.
+ * */
+#define VBOX_CROGL_USE_VBITS_SUPERSET
+
+#ifdef VBOX_CROGL_USE_VBITS_SUPERSET
+static GLuint desiredVisual = CR_RGB_BIT | CR_ALPHA_BIT | CR_DEPTH_BIT | CR_STENCIL_BIT | CR_ACCUM_BIT | CR_DOUBLE_BIT;
+#else
 static GLuint desiredVisual = CR_RGB_BIT;
-
+#endif
+
+#ifndef VBOX_CROGL_USE_VBITS_SUPERSET
 /**
  * Compute a mask of CR_*_BIT flags which reflects the attributes of
@@ -72 +86 @@
     return b;
 }
+#endif
 
 void APIENTRY DrvReleaseContext(HGLRC hglrc)
@@ -144 +159 @@
 
     sprintf(dpyName, "%d", hdc);
+#ifndef VBOX_CROGL_USE_VBITS_SUPERSET
     if (stub.haveNativeOpenGL)
         desiredVisual |= ComputeVisBits( hdc );
+#endif
 
     context = stubNewContext(dpyName, desiredVisual, UNDECIDED, 0);

trunk/src/VBox/Additions/common/crOpenGL/wgl.c

@@ -17 +17 @@
 #include <stdio.h>
 
+/* Currently host part will misbehave re-creating context with proper visual bits
+ * if contexts with alternative visual bits is requested.
+ * For now we just report a superset of all visual bits to avoid that.
+ * Better to it on the host side as well?
+ * We could also implement properly multiple pixel formats,
+ * which should be done by implementing offscreen rendering or multiple host contexts.
+ * */
+#define VBOX_CROGL_USE_VBITS_SUPERSET
+
+#ifdef VBOX_CROGL_USE_VBITS_SUPERSET
+static GLuint desiredVisual = CR_RGB_BIT | CR_ALPHA_BIT | CR_DEPTH_BIT | CR_STENCIL_BIT | CR_ACCUM_BIT | CR_DOUBLE_BIT;
+#else
 static GLuint desiredVisual = CR_RGB_BIT;
-
-
+#endif
+
+#ifndef VBOX_CROGL_USE_VBITS_SUPERSET
 /**
  * Compute a mask of CR_*_BIT flags which reflects the attributes of
@@ -51 +64 @@
     return b;
 }
+#endif
 
 int WINAPI wglChoosePixelFormat_prox( HDC hdc, CONST PIXELFORMATDESCRIPTOR *pfd )
@@ -121 +135 @@
     }
 
-    /* @todo: although this is not needed by VSG Open Inventor interop,
-     * still it does not make any sense actually since reporting this
-     * as well as choosing a pixel format with this cap would not do anything
-     * since ICD stuff has its own pixelformat state var */
-//    if ( pfd->cAccumBits > 0 )
-//        desiredVisual |= CR_ACCUM_BIT;
+    if ( pfd->cAccumBits > 0 )
+        desiredVisual |= CR_ACCUM_BIT;
 
     if ( pfd->cDepthBits > 32 ) {
@@ -297 +307 @@
 
     sprintf(dpyName, "%d", hdc);
+#ifndef VBOX_CROGL_USE_VBITS_SUPERSET
     if (stub.haveNativeOpenGL)
         desiredVisual |= ComputeVisBits( hdc );
+#endif
 
     context = stubNewContext(dpyName, desiredVisual, UNDECIDED, 0);
@@ -494 +506 @@
             case WGL_ACCUM_BLUE_BITS_EXT:
                 if (pi[1] > 0)
-                {
-                    /* @todo: although this is not needed by VSG Open Inventor interop,
-                     * still it does not make any sense actually since reporting this
-                     * as well as choosing a pixel format with this cap would not do anything
-                     * since ICD stuff has its own pixelformat state var */
-                    crWarning("WGL_ACCUM_XXX not supporteed!");
-                    return 0;
-//                    desiredVisual |= CR_ACCUM_BIT;
-                }
+                    desiredVisual |= CR_ACCUM_BIT;
                 pi++;
                 break;