Merge remote branch 'origin/master' into glsl2

Browse Source

This pulls in multiple i965 driver fixes which will help ensure better
testing coverage during development, and also gets past the conflicts
of the src/mesa/shader -> src/mesa/program move.

Conflicts:
	src/mesa/Makefile
	src/mesa/main/shaderapi.c
	src/mesa/main/shaderobj.h

...

This commit is contained in:

Eric Anholt

2010-07-26 17:47:59 -07:00

parent d64343f1ae 5403ca79b2

commit afe125e0a1

798 changed files with 35504 additions and 23336 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1640

src/mesa/main/shaderapi.c Normal file

File diff suppressed because it is too large Load Diff