Ian Romanick 8fc433fa0f Merge branch 'mesa_7_6_branch' into mesa_7_7_branch ... Conflicts: progs/demos/projtex.c progs/xdemos/glxinfo.c src/mesa/main/version.h To fix the confilicts in projtex.c and glxinfo.c I just took the code from mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from mesa_7_7_branch to mesa_7_6_branch followed by commmits just to mesa_7_6_branch.		2009-12-07 17:16:10 -08:00
..
.gitignore	progs/xdemos: add multictx to .gitignore	2009-08-19 08:58:38 -06:00
corender.c	progs/xdemos: Add assert in corender.c.	2009-12-03 23:22:47 -08:00
glsync.c	progs/xdemos: fix command line flag typo	2009-10-22 17:11:59 -06:00
glthreads.c	xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAY	2009-06-30 13:58:21 -06:00
glxcontexts.c	xdemos/glxcontexts: Don't leak visual info when choosing visual again.	2009-08-03 11:55:29 -06:00
glxdemo.c	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
glxgears.c	glxgears: make functions static, update comments	2009-08-07 09:50:38 -06:00
glxgears_fbconfig.c	Use XDisplayName() when reporting errors (bug 8079).	2006-12-13 08:30:26 -07:00
glxgears_pixmap.c	Add GLXPixmap version of glxgears to show case new GLX Pixmap functionality.	2008-02-14 22:05:55 -05:00
glxheads.c	xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAY	2009-06-30 13:58:21 -06:00
glxinfo.c	progs/xdemos: fix some visual/fbconfig logic in glxinfo.c	2009-12-04 08:09:57 -07:00
glxpbdemo.c	progs/xdemos: Fix memory leak in glxpbdemo.c.	2009-11-20 15:18:19 -08:00
glxpixmap.c	demos: fix glxpixmap and call glXWaitGL before calling XCopyArea.	2009-02-16 11:56:21 +00:00
glxsnoop.c	New glxsnoop demo to display another window's z/stencil/back buffer.	2007-10-11 16:39:02 -06:00
glxswapcontrol.c	Merge branch 'mesa_7_5_branch'	2009-08-05 14:13:48 -06:00
ipc.c	Fix xdemos build on FreeBSD: <sys/types.h> before <netinet/tcp.h>	2008-03-21 14:19:30 -07:00
ipc.h	Example of cooperative rendering into one window by two processes	2007-10-11 18:25:12 -06:00
Makefile	progs/xdemos: added -lX11 -lpthread for GNU gold linker	2009-11-17 13:40:00 -07:00
manywin.c	xdemos: On termination with esc close the contexts correctly.	2009-03-11 13:35:27 +00:00
multictx.c	progs/xdemos: added multictx.c (multi-context rendering demo)	2009-08-07 09:52:18 -06:00
offset.c	progs/xdemos: Add missing break statement in offset.c.	2009-12-04 00:01:20 -08:00
opencloseopen.c	xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAY	2009-06-30 13:58:21 -06:00
overlay.c	demos: better error message for overlay.c, see bug 20055	2009-02-11 07:53:56 -07:00
pbdemo.c	progs/xdemos: Fix memory leak in pbdemo.c.	2009-12-04 00:03:14 -08:00
pbinfo.c	progs/xdemos: Fix memory leak in pbinfo.c.	2009-11-20 15:52:53 -08:00
pbutil.c	pbutil: Do not require GLX_SGIX_pbuffer for fbconfig only-functions.	2007-10-17 17:04:59 -04:00
pbutil.h	pbutil: Do not require GLX_SGIX_pbuffer for fbconfig only-functions.	2007-10-17 17:04:59 -04:00
shape.c	remove unused var	2008-01-22 07:57:33 -07:00
sharedtex.c	added xdemos/sharedtex.c test	2008-04-30 15:30:29 -06:00
sharedtex_mt.c	progs/xdemos: Silence unused value warnings in sharedtex_mt.c.	2009-12-04 00:04:38 -08:00
texture_from_pixmap.c	use glXGetProcAddress to get extension funcs	2007-05-29 08:08:03 -06:00
vgears.c	Remove CVS keywords.	2008-09-21 11:00:44 -07:00
vindex.c	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
vtest.c	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
wincopy.c	Added -clip option to test glCopyPixels beyond window bounds.	2006-10-16 23:22:44 +00:00
xdemo.c	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
xfont.c	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
xrotfontdemo.c	New glXUseRotatedXFontMESA() function. Like glXUseXFont(), but takes	2004-01-24 16:50:35 +00:00
xuserotfont.c	silence a warning	2004-08-13 21:05:02 +00:00
xuserotfont.h	New glXUseRotatedXFontMESA() function. Like glXUseXFont(), but takes	2004-01-24 16:50:35 +00:00
yuvrect_client.c	Use XDisplayName() when reporting errors (bug 8079).	2006-12-13 08:30:26 -07:00