http://packetstormsecurity.org/UNIX/admin/xscreensaver-3.34.tar.gz

[xscreensaver] / utils / visual-gl.c

diff --git a/utils/visual-gl.c b/utils/visual-gl.c
index 0a52e160c2c76cc0fafab2680312249942f6279e..054bfaf2b6b061549d2a8add3a208383146adb98 100644 (file)
--- a/utils/visual-gl.c
+++ b/utils/visual-gl.c
@@ -42,19 +42,20 @@ get_gl_visual (Screen *screen)
 # define B GLX_BLUE_SIZE
 # define D GLX_DEPTH_SIZE
 # define I GLX_BUFFER_SIZE
+# define DB GLX_DOUBLEBUFFER
 
   int attrs[][20] = {
-   { GLX_RGBA, R, 8, G, 8, B, 8, D, 8, GLX_DOUBLEBUFFER, 0 }, /* rgb double */
-   { GLX_RGBA, R, 4, G, 4, B, 4, D, 4, GLX_DOUBLEBUFFER, 0 },
-   { GLX_RGBA, R, 2, G, 2, B, 2, D, 2, GLX_DOUBLEBUFFER, 0 },
-   { GLX_RGBA, R, 8, G, 8, B, 8, D, 8,                   0 }, /* rgb single */
-   { GLX_RGBA, R, 4, G, 4, B, 4, D, 4,                   0 },
-   { GLX_RGBA, R, 2, G, 2, B, 2, D, 2,                   0 },
-   { I, 8,                       D, 8, GLX_DOUBLEBUFFER, 0 }, /* cmap double */
-   { I, 4,                       D, 4, GLX_DOUBLEBUFFER, 0 },
-   { I, 8,                       D, 8,                   0 }, /* cmap single */
-   { I, 4,                       D, 4,                   0 },
-   { GLX_RGBA, R, 1, G, 1, B, 1, D, 1,                   0 }  /* monochrome */
+    { GLX_RGBA, R, 8, G, 8, B, 8, D, 8, DB, 0 }, /* rgb double */
+    { GLX_RGBA, R, 4, G, 4, B, 4, D, 4, DB, 0 },
+    { GLX_RGBA, R, 2, G, 2, B, 2, D, 2, DB, 0 },
+    { GLX_RGBA, R, 8, G, 8, B, 8, D, 8,     0 }, /* rgb single */
+    { GLX_RGBA, R, 4, G, 4, B, 4, D, 4,     0 },
+    { GLX_RGBA, R, 2, G, 2, B, 2, D, 2,     0 },
+    { I, 8,                       D, 8, DB, 0 }, /* cmap double */
+    { I, 4,                       D, 4, DB, 0 },
+    { I, 8,                       D, 8,     0 }, /* cmap single */
+    { I, 4,                       D, 4,     0 },
+    { GLX_RGBA, R, 1, G, 1, B, 1, D, 1,     0 }  /* monochrome */
   };
 
   int i;
@@ -138,13 +139,18 @@ describe_gl_visual (FILE *f, Screen *screen, Visual *visual,
 # ifdef GLX_VISUAL_CAVEAT_EXT
     if (!glXGetConfig (dpy, vi_out, GLX_VISUAL_CAVEAT_EXT, &value) &&
         value != GLX_NONE_EXT)
+#   ifdef GLX_NON_CONFORMANT_EXT
       printf ("    GLX rating:        %s\n",
               (value == GLX_NONE_EXT ? "none" :
                value == GLX_SLOW_VISUAL_EXT ? "slow" :
-#   ifdef GLX_NON_CONFORMANT_EXT
                value == GLX_NON_CONFORMANT_EXT ? "non-conformant" :
-#   endif /* GLX_NON_CONFORMANT_EXT */
                "???"));
+#   else      
+      printf ("    GLX rating:        %s\n",
+              (value == GLX_NONE_EXT ? "none" :
+               value == GLX_SLOW_VISUAL_EXT ? "slow" :
+               "???"));
+#   endif /* GLX_NON_CONFORMANT_EXT */
 # endif /* GLX_VISUAL_CAVEAT_EXT */
 
     if (!glXGetConfig (dpy, vi_out, GLX_DOUBLEBUFFER, &value))