From 23ae31820042f2bc4694f7c48696a697d674b802 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Sun, 17 Jan 2010 14:49:34 -0800
Subject: glxgears: unbind current context before "destroying" it

glXDestroyContext does not destroy the context if it's still
connected to some window. Unbind context from window to test it.

Signed-off-by: Brian Paul <brianp@vmware.com>
---
 progs/xdemos/glxgears.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs')

diff --git a/progs/xdemos/glxgears.c b/progs/xdemos/glxgears.c
index 088f25a357..2993c82416 100644
--- a/progs/xdemos/glxgears.c
+++ b/progs/xdemos/glxgears.c
@@ -771,6 +771,7 @@ main(int argc, char *argv[])
    glDeleteLists(gear1, 1);
    glDeleteLists(gear2, 1);
    glDeleteLists(gear3, 1);
+   glXMakeCurrent(dpy, None, NULL);
    glXDestroyContext(dpy, ctx);
    XDestroyWindow(dpy, win);
    XCloseDisplay(dpy);
-- 
cgit v1.2.3


From 8bc3c06d86b9c4b440402f1ca419da3045d2ed25 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Thu, 21 Jan 2010 23:24:40 -0800
Subject: progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.

---
 progs/trivial/tri-fbo-tex-mip.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'progs')

diff --git a/progs/trivial/tri-fbo-tex-mip.c b/progs/trivial/tri-fbo-tex-mip.c
index df4725c7b4..2e8fb74a00 100644
--- a/progs/trivial/tri-fbo-tex-mip.c
+++ b/progs/trivial/tri-fbo-tex-mip.c
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 
 /* For debug */
 
-- 
cgit v1.2.3