From b59eb3b8b14a8973dd133cbc73949a0993d07fb6 Mon Sep 17 00:00:00 2001 From: Pauli Nieminen Date: Mon, 3 Aug 2009 10:43:38 -0700 Subject: xdemos/glxcontexts: Don't leak visual info when choosing visual again. Signed-off-by: Pauli Nieminen --- progs/xdemos/glxcontexts.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'progs') 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"); -- cgit v1.2.3 From fb7cf731f9028c1c53addb6c10c68bd4c1794ae6 Mon Sep 17 00:00:00 2001 From: Pauli Nieminen Date: Mon, 3 Aug 2009 12:05:33 -0700 Subject: xdemo/glxswapcontrol: Move get_framge_usage after the swap. This fixes the problem that first frame would report bogus usage values. Problem was caused because get_frame_usage returned data from previous buffer swap. Signed-off-by: Pauli Nieminen --- progs/xdemos/glxswapcontrol.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'progs') diff --git a/progs/xdemos/glxswapcontrol.c b/progs/xdemos/glxswapcontrol.c index 5a5d084f90..8cdd560207 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; -- cgit v1.2.3