diff options
author | Julien Cristau <jcristau@debian.org> | 2009-05-03 14:26:30 +0200 |
---|---|---|
committer | Julien Cristau <jcristau@debian.org> | 2009-05-03 14:26:30 +0200 |
commit | 64cb29deca0207d1676bbdc089fb333b4115d38a (patch) | |
tree | 0dfe0d1c4ddd01a577e16266079f78c36020329d /progs | |
parent | d7b9a6c9ef2c825f8c1e94fcbbaa053ae4cf813e (diff) | |
parent | 63375254979be322736fd3ea1c692c6ab08e817b (diff) |
Merge branch 'mesa_7_4_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
Diffstat (limited to 'progs')
-rw-r--r-- | progs/samples/blendeq.c | 2 | ||||
-rw-r--r-- | progs/xdemos/glxcontexts.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/progs/samples/blendeq.c b/progs/samples/blendeq.c index d5143ecdf5c..48dea04d148 100644 --- a/progs/samples/blendeq.c +++ b/progs/samples/blendeq.c @@ -103,7 +103,7 @@ static void PrintColorStrings( void ) { GLubyte ubbuf[3]; int i, xleft, xright; - char colorString[18]; + char colorString[100]; xleft = 5 + windW/4; xright = 5 + windW/2; diff --git a/progs/xdemos/glxcontexts.c b/progs/xdemos/glxcontexts.c index a9ff326ed5e..a97b62a9081 100644 --- a/progs/xdemos/glxcontexts.c +++ b/progs/xdemos/glxcontexts.c @@ -385,6 +385,10 @@ draw( Display *dpy, Window win ) } else do_draw(); + glDeleteLists(gear1, 1); + glDeleteLists(gear2, 1); + glDeleteLists(gear3, 1); + glXSwapBuffers(dpy, win); glXDestroyContext(dpy, ctx); } |