6 files changed, 13 insertions, 1 deletions
diff --git a/progs/demos/.cvsignore b/progs/demos/.gitignore
index f764b3d117..f764b3d117 100644
--- a/progs/demos/.cvsignore
+++ b/progs/demos/.gitignore
diff --git a/progs/redbook/.cvsignore b/progs/redbook/.gitignore
index 8ed3efe3e2..8ed3efe3e2 100644
--- a/progs/redbook/.cvsignore
+++ b/progs/redbook/.gitignore
diff --git a/progs/samples/.cvsignore b/progs/samples/.gitignore
index 12b0650567..12b0650567 100644
--- a/progs/samples/.cvsignore
+++ b/progs/samples/.gitignore
diff --git a/progs/tests/.cvsignore b/progs/tests/.gitignore
index 2c0e16c35e..2c0e16c35e 100644
--- a/progs/tests/.cvsignore
+++ b/progs/tests/.gitignore
diff --git a/progs/xdemos/.cvsignore b/progs/xdemos/.gitignore
index 4adffda2d1..4adffda2d1 100644
--- a/progs/xdemos/.cvsignore
+++ b/progs/xdemos/.gitignore
diff --git a/progs/xdemos/glxinfo.c b/progs/xdemos/glxinfo.c
index fdd1c0523f..a1aca5ad31 100644
--- a/progs/xdemos/glxinfo.c
+++ b/progs/xdemos/glxinfo.c
@@ -456,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");