Merge branch 'origin' into glsl-compiler-1
authorBrian <brian@yutani.localnet.net>
Thu, 22 Feb 2007 15:53:33 +0000 (08:53 -0700)
committerBrian <brian@yutani.localnet.net>
Thu, 22 Feb 2007 15:53:33 +0000 (08:53 -0700)
commit29c471aafc6a3fef23d553e31a555d1782854a77
tree335385fd55d510118346136c6feb4daa707988b6
parent6d4cf6be4e79c3a6ab18272577df17389e3834a6
parenta4b344baa2484c65a1618f3cce3a94c91dea8ef7
Merge branch 'origin' into glsl-compiler-1

Conflicts:

src/mesa/main/state.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/programopt.c
src/mesa/shader/slang/slang_execute.c
src/mesa/sources
src/mesa/swrast/s_arbshader.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_context.c
src/mesa/tnl/t_save_api.c
src/mesa/tnl/t_vb_arbprogram.c
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/t_vtx_eval.c
22 files changed:
src/mesa/drivers/dri/i915/i915_context.c
src/mesa/main/context.c
src/mesa/main/get.c
src/mesa/main/get_gen.py
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/state.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/programopt.c
src/mesa/sources
src/mesa/swrast/s_atifragshader.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_copypix.c
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_linetemp.h
src/mesa/swrast/s_pointtemp.h
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_context.c
src/mesa/tnl/t_context.h
src/mesa/tnl/t_vb_arbprogram.c
src/mesa/tnl/t_vp_build.c