diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
| commit | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (patch) | |
| tree | 2d9d05a5c3122f41a13aa8bd9ae921c1176e6b0d /progs/xdemos/glsync.c | |
| parent | bdaa0341caffc353fd26bbd91865c2d86eed11c1 (diff) | |
| parent | 114bb54324f22cb53bcd14607234d0acd74d37bd (diff) | |
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Diffstat (limited to 'progs/xdemos/glsync.c')
| -rw-r--r-- | progs/xdemos/glsync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/xdemos/glsync.c b/progs/xdemos/glsync.c index 95cd1af400..34167d339f 100644 --- a/progs/xdemos/glsync.c +++ b/progs/xdemos/glsync.c @@ -112,6 +112,7 @@ int main(int argc, char *argv[]) int attrib[14]; GLint last_val = -1, count = 0; Window winGL; + GLXContext context; int dummy; Atom wmDelete; enum sync_type waitforsync = none; @@ -185,7 +186,6 @@ int main(int argc, char *argv[]) attrib[10] = None; } - GLXContext context; pvi = glXChooseVisual(disp, DefaultScreen(disp), attrib); if (!pvi) { fprintf(stderr, "failed to choose visual, exiting\n"); |