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

author	Brian Paul <brianp@vmware.com>
	Sat, 15 Jan 2011 17:24:08 +0000 (10:24 -0700)
committer	Brian Paul <brianp@vmware.com>
	Sat, 15 Jan 2011 17:24:08 +0000 (10:24 -0700)
commit	652901e95b4ed406293d0e1fabee857c054119b1
tree	a4b40b134f7c6491cd8d9fe37590e99428d8fab5	tree
parent	21001d2ba79be26f565a6795a907ec266564f4cd	commit \| diff
parent	b7c38734c9d85f9dad1796d97690be2d9c55c397	commit \| diff

Merge branch 'draw-instanced'

Conflicts:
src/gallium/auxiliary/draw/draw_llvm.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/glsl/ir_set_program_inouts.cpp
src/mesa/tnl/t_vb_program.c

23 files changed:

src/gallium/auxiliary/draw/draw_llvm.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_vs_exec.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_vs_sse.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/gallivm/lp_bld_tgsi.h	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c	diff1 \|	diff2 \|	blob \| history
src/gallium/docs/source/screen.rst	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_fs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/glsl/glsl_parser_extras.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/glsl_parser_extras.h	diff1 \|	diff2 \|	blob \| history
src/glsl/ir.h	diff1 \|	diff2 \|	blob \| history
src/glsl/ir_set_program_inouts.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/ir_variable.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/main.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/main/extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/program/ir_to_mesa.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/program/prog_execute.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_mesa_to_tgsi.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_vb_program.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

src/gallium/auxiliary/draw/draw_llvm.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_vs_exec.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_vs_sse.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/gallivm/lp_bld_tgsi.h	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c	diff1 \|	diff2 \|	blob \| history
src/gallium/docs/source/screen.rst	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_fs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/glsl/glsl_parser_extras.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/glsl_parser_extras.h	diff1 \|	diff2 \|	blob \| history
src/glsl/ir.h	diff1 \|	diff2 \|	blob \| history
src/glsl/ir_set_program_inouts.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/ir_variable.cpp	diff1 \|	diff2 \|	blob \| history
src/glsl/main.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/main/extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/program/ir_to_mesa.cpp	diff1 \|	diff2 \|	blob \| history
src/mesa/program/prog_execute.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_mesa_to_tgsi.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_vb_program.c	diff1 \|	diff2 \|	blob \| history