Changeset 34138 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 17, 2010 2:29:56 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: add missing glx 1.3 functions, partially working ogre based demos

File:

• trunk/src/VBox/Additions/common/crOpenGL/glx.c (modified) (10 diffs)

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

@@ -668 +668 @@
 DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmap)( Display *dpy, XVisualInfo *vis, Pixmap pixmap )
 {
-    (void) dpy;
-    (void) vis;
-    (void) pixmap;
-
     stubInit();
-    crWarning( "Unsupported GLX Call: glXCreateGLXPixmap()" );
-    return (GLXPixmap) 0;
+    return VBOXGLXTAG(glXCreatePixmap)(dpy, (GLXFBConfig)vis->visualid, pixmap, NULL);
 }
 
@@ -1213 +1208 @@
 
         case GLX_VERSION:
-            retval  = "1.2 Chromium";
+            retval  = "1.3 Chromium";
             break;
 
@@ -1241 +1236 @@
 
         case GLX_VERSION:
-            retval  = "1.2 Chromium";
+            retval  = "1.3 Chromium";
             break;
 
@@ -1324 +1319 @@
                                   int *attrib_list, int *nelements)
 {
-    (void) dpy;
-    (void) screen;
-    (void) attrib_list;
-    (void) nelements;
-    crWarning("glXChooseFBConfigSGIX not implemented by Chromium");
-    return NULL;
+    return VBOXGLXTAG(glXChooseFBConfig)(dpy, screen, attrib_list, nelements);
 }
 
@@ -1337 +1327 @@
                                              Pixmap pixmap)
 {
-    (void) dpy;
-    (void) config;
-    (void) pixmap;
-    crWarning("glXCreateGLXPixmapWithConfigSGIX not implemented by Chromium");
-    return 0;    }
+    return VBOXGLXTAG(glXCreatePixmap)(dpy, config, pixmap, NULL);
+}
 
 DECLEXPORT(GLXContext) 
@@ -1349 +1336 @@
                                            Bool direct)
 {
-    (void) dpy;
-    (void) config;
-    (void) render_type;
-    (void) share_list;
-    (void) direct;
-    crWarning("glXCreateContextWithConfigSGIX not implemented by Chromium");
-    return NULL;
+    if (render_type!=GLX_RGBA_TYPE_SGIX)
+    {
+        crWarning("glXCreateContextWithConfigSGIX: Unsupported render type %i", render_type);
+        return NULL;
+    }
+    else
+    {
+        XVisualInfo *vis;
+        GLXContext ret;
+
+        vis = VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(dpy, config);
+        if (!vis)
+        {
+            crWarning("glXCreateContextWithConfigSGIX: no visuals for %p", config);
+            return NULL;
+        }
+        ret =  VBOXGLXTAG(glXCreateContext)(dpy, vis, share_list, direct);
+        XFree(vis);
+        return ret;
+    }
 }
 
@@ -1362 +1362 @@
                                          GLXFBConfig config)
 {
-    (void) dpy;
-    (void) config;
-    crWarning("glXGetVisualFromFBConfigSGIX not implemented by Chromium");
-    return NULL;
+    return VBOXGLXTAG(glXGetVisualFromFBConfig)(dpy, config);
 }
 
@@ -1371 +1368 @@
 VBOXGLXTAG(glXGetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis)
 {
-    (void) dpy;
-    (void) vis;
-    crWarning("glXGetFBConfigFromVisualSGIX not implemented by Chromium");
-    return NULL;
+    if (!vis)
+    {
+        return NULL;
+    }
+    /*Note: Caller is supposed to call XFree on returned value, so can't just return (GLXFBConfig)vis->visualid*/
+    return (GLXFBConfigSGIX) VBOXGLXTAG(glXGetVisualFromFBConfig)(dpy, (GLXFBConfig)vis->visualid);
 }
 
@@ -1380 +1379 @@
  * GLX 1.3 functions
  */
-DECLEXPORT(GLXFBConfig *) 
+DECLEXPORT(GLXFBConfig *)
 VBOXGLXTAG(glXChooseFBConfig)(Display *dpy, int screen, ATTRIB_TYPE *attrib_list, int *nelements)
 {
-    (void) dpy;
-    (void) screen;
-    (void) attrib_list;
-    (void) nelements;
-    crWarning("glXChooseFBConfig not implemented by Chromium");
+    ATTRIB_TYPE *attrib;
+    intptr_t fbconfig = 0;
+
+    stubInit();
+
+    if (!attrib_list)
+    {
+        return VBOXGLXTAG(glXGetFBConfigs)(dpy, screen, nelements);
+    }
+
+    for (attrib = attrib_list; *attrib != None; attrib++)
+    {
+        switch (*attrib)
+        {
+            case GLX_FBCONFIG_ID:
+                fbconfig = attrib[1];
+                attrib++;
+                break;
+
+            case GLX_BUFFER_SIZE:
+                /* this is for color-index visuals, which we don't support */
+                goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_LEVEL:
+                if (attrib[1] != 0)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_AUX_BUFFERS:
+                if (attrib[1] != 0)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_DOUBLEBUFFER: /* @todo, check if we support it */
+                attrib++;
+                break;
+
+            case GLX_STEREO:
+                if (attrib[1] != 0)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_RED_SIZE:
+            case GLX_GREEN_SIZE:
+            case GLX_BLUE_SIZE:
+            case GLX_ALPHA_SIZE:
+                if (attrib[1] > 8)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_DEPTH_SIZE:
+                if (attrib[1] > 16)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_STENCIL_SIZE:
+                if (attrib[1] > 8)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_ACCUM_RED_SIZE:
+            case GLX_ACCUM_GREEN_SIZE:
+            case GLX_ACCUM_BLUE_SIZE:
+            case GLX_ACCUM_ALPHA_SIZE:
+                if (attrib[1] > 16)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_X_RENDERABLE:
+            case GLX_CONFIG_CAVEAT:
+                attrib++;
+                break;
+
+            case GLX_RENDER_TYPE:
+                if (attrib[1]!=GLX_RGBA_BIT)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_DRAWABLE_TYPE:
+                if (attrib[1]!=GLX_WINDOW_BIT)
+                    goto err_exit;
+                attrib++;
+                break;
+
+            case GLX_X_VISUAL_TYPE:
+            case GLX_TRANSPARENT_TYPE_EXT:
+            case GLX_TRANSPARENT_INDEX_VALUE_EXT:
+            case GLX_TRANSPARENT_RED_VALUE_EXT:
+            case GLX_TRANSPARENT_GREEN_VALUE_EXT:
+            case GLX_TRANSPARENT_BLUE_VALUE_EXT:
+            case GLX_TRANSPARENT_ALPHA_VALUE_EXT:
+                /* ignore */
+                crWarning("glXChooseVisual: ignoring attribute 0x%x", *attrib);
+                attrib++;
+                break;
+
+                break;
+            default:
+                crWarning( "glXChooseVisual: bad attrib=0x%x, ignoring", *attrib );
+                attrib++;
+                break;
+        }
+    }
+
+    if (fbconfig)
+    {
+        GLXFBConfig *pGLXFBConfigs;
+
+        *nelements = 1;
+        pGLXFBConfigs = (GLXFBConfig *) crAlloc(*nelements * sizeof(GLXFBConfig));
+        pGLXFBConfigs[0] = (GLXFBConfig)fbconfig;
+        return pGLXFBConfigs;
+    }
+    else
+    {
+        return VBOXGLXTAG(glXGetFBConfigs)(dpy, screen, nelements);
+    }
+
+err_exit:
+    crWarning("glXChooseFBConfig returning NULL, due to attrib=0x%x, next=0x%x", attrib[0], attrib[1]);
     return NULL;
 }
@@ -1720 +1844 @@
         case GLX_SAMPLES:
             *value = 1;
+            break;
+        case GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT:
+            *value = 0;
             break;
         default: