diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
---|---|---|
committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
commit | c5c19919ce627b98d8aab4284da1694573bcccd4 (patch) | |
tree | 2e29b313b79b6a392e020fd5723e3cc00c800fd2 /progs/xdemos/glthreads.c | |
parent | a0d4a12614fce072fa1eb5516e626909171c95e1 (diff) | |
parent | 3a3b83e5112b725e22f05b32a273a2351b820944 (diff) |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
Diffstat (limited to 'progs/xdemos/glthreads.c')
-rw-r--r-- | progs/xdemos/glthreads.c | 4 |
1 files changed, 2 insertions, 2 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; |