Merge branch 'glsl-to-tgsi'
authorBryan Cain <bryancain3@gmail.com>
Thu, 4 Aug 2011 20:43:34 +0000 (15:43 -0500)
committerBryan Cain <bryancain3@gmail.com>
Thu, 4 Aug 2011 20:43:34 +0000 (15:43 -0500)
commit4683529048ee133481b2d8f1cae1685aa1736f9a
treee02d90f4164e4dc6259000c358d65e6af84a3a31
parent50073563b2bfe3716b3dc8b1ed2f91381ba24305
parent9adcab9cd464d659288e31e6767efb5dee3894ff
Merge branch 'glsl-to-tgsi'

Conflicts:
src/mesa/state_tracker/st_atom_pixeltransfer.c
src/mesa/state_tracker/st_program.c
19 files changed:
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/drivers/i915/i915_screen.c
src/gallium/drivers/nv50/nv50_screen.c
src/gallium/drivers/nvc0/nvc0_screen.c
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/r600/r600_pipe.c
src/gallium/include/pipe/p_defines.h
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/main/ff_fragment_shader.cpp
src/mesa/main/uniforms.c
src/mesa/program/ir_to_mesa.cpp
src/mesa/program/program.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
src/mesa/state_tracker/st_program.c
src/mesa/state_tracker/st_texture.c