get rid of unused span->start field

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

diff --git a/progs/xdemos/glxinfo.c b/progs/xdemos/glxinfo.c
index 25dc3986ed75f25287f48ae44aa8a85a6ba8ceea..a1aca5ad31e800399b664552bca11323273a329d 100644 (file)
--- a/progs/xdemos/glxinfo.c
+++ b/progs/xdemos/glxinfo.c
@@ -33,6 +33,8 @@
  * Brian Paul  26 January 2000
  */
 
+#define GLX_GLXEXT_PROTOTYPES
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <GL/gl.h>
@@ -50,6 +52,7 @@
 #define GLX_TRANSPARENT_RGB 0x8008
 #endif
 
+
 typedef enum
 {
    Normal,
@@ -203,7 +206,7 @@ print_program_limits(GLenum target)
          printf("        %s = %d\n", limits[i].name, max[0]);
       }
    }
-#endif /* GL_ARB_vertex_program */   
+#endif /* GL_ARB_vertex_program / GL_ARB_fragment_program */
 }
 
 
@@ -341,18 +344,26 @@ print_limits(const char *extensions)
       printf("    GL_MAX_CONVOLUTION_WIDTH/HEIGHT = %d, %d\n", max[0], max[1]);
    }
 
+#if defined(GL_ARB_vertex_program)
    if (strstr(extensions, "GL_ARB_vertex_program")) {
       print_program_limits(GL_VERTEX_PROGRAM_ARB);
    }
+#endif
+#if defined(GL_ARB_fragment_program)
    if (strstr(extensions, "GL_ARB_fragment_program")) {
       print_program_limits(GL_FRAGMENT_PROGRAM_ARB);
    }
+#endif
+#if defined(GL_ARB_vertex_shader)
    if (strstr(extensions, "GL_ARB_vertex_shader")) {
       print_shader_limits(GL_VERTEX_SHADER_ARB);
    }
+#endif
+#if defined(GL_ARB_fragment_shader)
    if (strstr(extensions, "GL_ARB_fragment_shader")) {
       print_shader_limits(GL_FRAGMENT_SHADER_ARB);
    }
+#endif
 }
 
 
@@ -445,7 +456,19 @@ print_screen_info(Display *dpy, int scrnum, Bool allowDirect, GLboolean limits)
       }
       printf("display: %s  screen: %d\n", displayName, scrnum);
       free(displayName);
-      printf("direct rendering: %s\n", glXIsDirect(dpy, ctx) ? "Yes" : "No");
+      printf("direct rendering: ");
+      if (glXIsDirect(dpy, ctx)) {
+         printf("Yes\n");
+      } else {
+         if (!allowDirect) {
+            printf("No (-i specified)\n");
+         } else if (getenv("LIBGL_ALWAYS_INDIRECT")) {
+            printf("No (LIBGL_ALWAYS_INDIRECT set)\n");
+         } else {
+            printf("No (If you want to find out why, try setting "
+                   "LIBGL_DEBUG=verbose)\n");
+         }
+      }
       printf("server glx vendor string: %s\n", serverVendor);
       printf("server glx version string: %s\n", serverVersion);
       printf("server glx extensions:\n");