2 Commits

Author	SHA1	Message	Date
Eric Anholt	afe125e0a1	Merge remote branch 'origin/master' into glsl2 ... 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	2010-07-26 17:53:27 -07:00
Brian Paul	ec2b92f98c	mesa: rename src/mesa/shader/ to src/mesa/program/	2010-06-10 23:23:13 -06:00