get rid of unused span->start field

[mesa.git] / progs / xdemos / pbinfo.c

diff --git a/progs/xdemos/pbinfo.c b/progs/xdemos/pbinfo.c
index 948ad9ca22ca4c9e7c40ade38ebbdaae50ed0723..88d93c8da625cb21f7e024523ea8f8858c7042bd 100644 (file)
--- a/progs/xdemos/pbinfo.c
+++ b/progs/xdemos/pbinfo.c
@@ -20,53 +20,26 @@
 static void
 PrintConfigs(Display *dpy, int screen, Bool horizFormat)
 {
-   GLXFBConfigSGIX *fbConfigs;
+   FBCONFIG *fbConfigs;
    int nConfigs;
    int i;
-   /* Note: you may want to tweek the attribute list to select a different
-    * set of fbconfigs.
-    */
-   int fbAttribs[] = {
-                      GLX_RENDER_TYPE_SGIX, 0,
-                     GLX_DRAWABLE_TYPE_SGIX, 0,
-#if 0
-                      GLX_RENDER_TYPE_SGIX, GLX_RGBA_BIT_SGIX,
-                     GLX_DRAWABLE_TYPE_SGIX, GLX_PIXMAP_BIT_SGIX,
-                     GLX_RED_SIZE, 1,
-                     GLX_GREEN_SIZE, 1,
-                     GLX_BLUE_SIZE, 1,
-                     GLX_DEPTH_SIZE, 1,
-                     GLX_DOUBLEBUFFER, 0,
-                     GLX_STENCIL_SIZE, 0,
-#endif
-                     None};
-
-
-   /* Get list of possible frame buffer configurations */
-#if 0
-   /* SGIX method */
-   fbConfigs = glXChooseFBConfigSGIX(dpy, screen, fbAttribs, &nConfigs);
-#else
-   /* GLX 1.3 method */
-   (void) fbAttribs;
-   fbConfigs = glXGetFBConfigs(dpy, screen, &nConfigs);
-#endif
-
-   if (nConfigs==0 || !fbConfigs) {
-      printf("Error: glxChooseFBConfigSGIX failed\n");
+
+   fbConfigs = GetAllFBConfigs(dpy, screen, &nConfigs);
+   if (!nConfigs || !fbConfigs) {
+      printf("Error: glxGetFBConfigs failed\n");
       return;
    }
 
    printf("Number of fbconfigs: %d\n", nConfigs);
 
    if (horizFormat) {
-      printf("  ID  VisualType  Depth Lvl RGB CI DB Stereo  R  G  B  A");
-      printf("   Z  S  AR AG AB AA  MSbufs MSnum  Pbuffer\n");
+      printf("  ID        VisualType  Depth Lvl RGB CI DB Stereo  R  G  B  A");
+      printf("   Z  S  AR AG AB AA  MSbufs MSnum  Pbuffer  Float\n");
    }
 
    /* Print config info */
-   for (i=0;i<nConfigs;i++) {
-      PrintFBConfigInfo(dpy, fbConfigs[i], horizFormat);
+   for (i = 0; i < nConfigs; i++) {
+      PrintFBConfigInfo(dpy, screen, fbConfigs[i], horizFormat);
    }
 
    /* free the list */