Merge branch '965-glsl'
authorZou Nan hai <nanhai.zou@intel.com>
Fri, 26 Oct 2007 07:39:50 +0000 (15:39 +0800)
committerZou Nan hai <nanhai.zou@intel.com>
Fri, 26 Oct 2007 07:39:50 +0000 (15:39 +0800)
commit6ef27b88e6f767cd476676b33cb7c4ea6922234e
tree463d6a70b986cb62b3516ef6fd8e691f680f30ea
parentff042bfdeeeb0a3d658d5ab1dbdcac7b67aac0f8
parentde803f538c16096c9e241cfdddc092ac2aa2504e
Merge branch '965-glsl'

Conflicts:

src/mesa/drivers/dri/i965/brw_sf.h
src/mesa/drivers/dri/i965/intel_context.c
14 files changed:
src/mesa/drivers/dri/i965/Makefile
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_sf.h
src/mesa/drivers/dri/i965/brw_vs.h
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/i965/brw_vs_tnl.c
src/mesa/drivers/dri/i965/brw_wm.c
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/drivers/dri/i965/brw_wm_fp.c
src/mesa/drivers/dri/i965/brw_wm_state.c
src/mesa/drivers/dri/i965/intel_context.c
src/mesa/main/texenvprogram.c
src/mesa/shader/program.c
src/mesa/shader/slang/slang_codegen.c