git.libre-soc.org Git - mesa.git/commit

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5007356 9adcab9)

author	Bryan Cain <bryancain3@gmail.com>
	Thu, 4 Aug 2011 20:43:34 +0000 (15:43 -0500)
committer	Bryan Cain <bryancain3@gmail.com>
	Thu, 4 Aug 2011 20:43:34 +0000 (15:43 -0500)
commit	4683529048ee133481b2d8f1cae1685aa1736f9a
tree	e02d90f4164e4dc6259000c358d65e6af84a3a31	tree
parent	50073563b2bfe3716b3dc8b1ed2f91381ba24305	commit \| diff
parent	9adcab9cd464d659288e31e6767efb5dee3894ff	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nvc0/nvc0_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nvfx/nvfx_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_pipe.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_fs.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vs_emit.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/ff_fragment_shader.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/main/uniforms.c	diff1 \|	diff2 \|	blob \| history
src/mesa/program/ir_to_mesa.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/program/program.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_bitmap.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_glsl_to_tgsi.cpp	\|	diff2 \|	blob \| history
src/mesa/state_tracker/st_program.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_texture.c	diff1 \|	diff2 \|	blob \| history