diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-05 14:13:48 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-05 14:13:48 -0600 |
| commit | 1f713059934c2365a42aadfdca49213b36a7de90 (patch) | |
| tree | e116f5f41dfde926be870dfc439a7dfbaa0ded06 /progs/xdemos | |
| parent | 3905119b4743eb5d284236cc237ee2c19ae3c5c8 (diff) | |
| parent | 5b3428d7453eec8e8a5344e22113774dea1dc456 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/state.c
Diffstat (limited to 'progs/xdemos')
| -rw-r--r-- | progs/xdemos/glxcontexts.c | 3 | ||||
| -rw-r--r-- | progs/xdemos/glxswapcontrol.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/progs/xdemos/glxcontexts.c b/progs/xdemos/glxcontexts.c index 481749be3d..9f83679acd 100644 --- a/progs/xdemos/glxcontexts.c +++ b/progs/xdemos/glxcontexts.c @@ -378,6 +378,9 @@ make_window( Display *dpy, const char *name, scrnum = DefaultScreen( dpy ); root = RootWindow( dpy, scrnum ); + if (visinfo) + XFree(visinfo); + visinfo = glXChooseVisual( dpy, scrnum, attribs ); if (!visinfo) { printf("Error: couldn't get an RGB, Double-buffered visual\n"); diff --git a/progs/xdemos/glxswapcontrol.c b/progs/xdemos/glxswapcontrol.c index df9f7ad784..cd60d460a0 100644 --- a/progs/xdemos/glxswapcontrol.c +++ b/progs/xdemos/glxswapcontrol.c @@ -587,6 +587,9 @@ event_loop(Display *dpy, Window win) angle += 2.0; draw(); + + glXSwapBuffers(dpy, win); + if ( get_frame_usage != NULL ) { GLfloat temp; @@ -594,8 +597,6 @@ event_loop(Display *dpy, Window win) frame_usage += temp; } - glXSwapBuffers(dpy, win); - /* calc framerate */ { static int t0 = -1; |