Commit Graph

6 Commits

Author SHA1 Message Date
Brian Paul
9eb7fc6661 Merge branch 'mesa_7_7_branch'
Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c
2009-12-21 18:35:54 -07:00
Vinson Lee
41377942d3 progs/demos: Use C-style comment. 2009-12-18 23:34:28 -08:00
Brian Paul
263f4322e7 progs/demos: fix glut initialization calls
Remove glutInitWindowPosition() calls to play nicer with window managers.

Move glutInitWindowSize() calls before glutInit() so the the default window
size can be overridden by the -geometry cmd line option.
2009-12-18 13:58:14 -07:00
Brian Paul
1888a72765 progs/demos: silence warnings 2009-11-17 16:16:30 -07:00
Brian Paul
2278107b24 mesa: more test options in progs/demos/textures.c 2008-10-20 17:43:05 -06:00
Brian Paul
f6e806a2b8 mesa: simple multiple textures test 2008-10-09 19:51:26 -06:00