diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2009-07-03 18:53:58 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-07-03 18:53:58 +0200 |
| commit | 862488075c5537b0613753b0d14c267527fc6199 (patch) | |
| tree | fd4d51272c86fbc88c12e2d16649547f3ca7b8df /progs/xdemos | |
| parent | 060c7f2321f72503c14f9f3f7bb27d59d8a90224 (diff) | |
| parent | 94e1117c9ba259665cd8e790369dcd4c789a2f93 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/dlist.c
src/mesa/vbo/vbo_save_api.c
Diffstat (limited to 'progs/xdemos')
| -rw-r--r-- | progs/xdemos/glthreads.c | 4 | ||||
| -rw-r--r-- | progs/xdemos/glxheads.c | 3 | ||||
| -rw-r--r-- | progs/xdemos/glxswapcontrol.c | 2 | ||||
| -rw-r--r-- | progs/xdemos/opencloseopen.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/progs/xdemos/glthreads.c b/progs/xdemos/glthreads.c index b90e6b4f31..ea5474870b 100644 --- a/progs/xdemos/glthreads.c +++ b/progs/xdemos/glthreads.c @@ -26,7 +26,7 @@ * -p Open a display connection for each thread * -l Enable application-side locking * -n <num threads> Number of threads to create (default is 2) - * -display <display name> Specify X display (default is :0.0) + * -display <display name> Specify X display (default is $DISPLAY) * -t Use texture mapping * * Brian Paul 20 July 2000 @@ -573,7 +573,7 @@ usage(void) int main(int argc, char *argv[]) { - char *displayName = ":0.0"; + char *displayName = NULL; int numThreads = 2; Display *dpy = NULL; int i; diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c index b3290e90d5..b1a63d3d50 100644 --- a/progs/xdemos/glxheads.c +++ b/progs/xdemos/glxheads.c @@ -267,7 +267,8 @@ main(int argc, char *argv[]) printf(" glxheads xdisplayname ...\n"); printf("Example:\n"); printf(" glxheads :0 mars:0 venus:1\n"); - h = AddHead(":0"); + + h = AddHead(XDisplayName(NULL)); if (h) PrintInfo(h); } diff --git a/progs/xdemos/glxswapcontrol.c b/progs/xdemos/glxswapcontrol.c index 2c51801989..5a5d084f90 100644 --- a/progs/xdemos/glxswapcontrol.c +++ b/progs/xdemos/glxswapcontrol.c @@ -759,7 +759,7 @@ main(int argc, char *argv[]) Display *dpy; Window win; GLXContext ctx; - char *dpyName = ":0"; + char *dpyName = NULL; int swap_interval = 1; GLboolean do_swap_interval = GL_FALSE; GLboolean force_get_rate = GL_FALSE; diff --git a/progs/xdemos/opencloseopen.c b/progs/xdemos/opencloseopen.c index 0b8d061843..756096095e 100644 --- a/progs/xdemos/opencloseopen.c +++ b/progs/xdemos/opencloseopen.c @@ -158,7 +158,7 @@ main(int argc, char *argv[]) Display *dpy; Window win; GLXContext ctx; - char *dpyName = ":0"; + char *dpyName = NULL; int i; for (i = 1; i < argc; i++) { |