Merge remote branch 'origin/master' into glsl2
authorEric Anholt <eric@anholt.net>
Tue, 27 Jul 2010 00:47:59 +0000 (17:47 -0700)
committerEric Anholt <eric@anholt.net>
Tue, 27 Jul 2010 00:53:27 +0000 (17:53 -0700)
commitafe125e0a18ac3886c45c7e6b02b122fb2d327b5
tree78621707e71154c0b388b0baacffc26432b7e992
parentd64343f1ae84979bd154475badf11af8a9bfc2eb
parent5403ca79b225605c79f49866a6497c97da53be3b
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
25 files changed:
configure.ac
src/glsl/Makefile
src/glsl/glsl_symbol_table.h
src/glsl/linker.cpp
src/glsl/program.h
src/mesa/Makefile
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/drivers/dri/i965/brw_wm_emit.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/main/mtypes.h
src/mesa/main/shaderapi.c
src/mesa/main/shaderobj.c
src/mesa/main/shaderobj.h
src/mesa/program/hash_table.c
src/mesa/program/hash_table.h
src/mesa/program/ir_to_mesa.cpp
src/mesa/program/ir_to_mesa.h
src/mesa/program/prog_execute.c
src/mesa/program/prog_instruction.h
src/mesa/program/prog_optimize.c
src/mesa/program/prog_parameter.c
src/mesa/program/symbol_table.c
src/mesa/program/symbol_table.h
src/mesa/sources.mak