git.osdn.net Git - android-x86/external-mesa.git/commit

Merge remote branch 'origin/master' into lp-binning

Conflicts:
src/gallium/auxiliary/util/u_surface.c
src/gallium/drivers/llvmpipe/Makefile
src/gallium/drivers/llvmpipe/SConscript
src/gallium/drivers/llvmpipe/lp_bld_arit.c
src/gallium/drivers/llvmpipe/lp_bld_flow.c
src/gallium/drivers/llvmpipe/lp_bld_interp.c
src/gallium/drivers/llvmpipe/lp_clear.c
src/gallium/drivers/llvmpipe/lp_context.c
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/llvmpipe/lp_draw_arrays.c
src/gallium/drivers/llvmpipe/lp_jit.c
src/gallium/drivers/llvmpipe/lp_jit.h
src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_state.h
src/gallium/drivers/llvmpipe/lp_state_blend.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/llvmpipe/lp_state_sampler.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_tex_cache.h
src/gallium/drivers/llvmpipe/lp_tex_sample.h
src/gallium/drivers/llvmpipe/lp_tile_cache.c

author	José Fonseca <jfonseca@vmware.com>
	Fri, 8 Jan 2010 15:42:57 +0000 (15:42 +0000)
committer	José Fonseca <jfonseca@vmware.com>
	Fri, 8 Jan 2010 15:42:57 +0000 (15:42 +0000)
commit	080c40ab32b2abd6d8381b4a0cc143d36a1652b2
tree	e173767ebc5a82d81b9fc086449d915e29348976	tree \| snapshot
parent	9cdf6f025b2ed55cfb13dd09f870f01d0c7947d3	commit \| diff
parent	a1de400e8de06a80ab140bb0fa950e990607572d	commit \| diff

Makefile	diff1 \|	diff2 \|	blob \| history
configs/linux-llvm	diff1 \|	diff2 \|	blob \| history
progs/demos/gloss.c	diff1 \|	diff2 \|	blob \| history
progs/trivial/Makefile	diff1 \|	diff2 \|	blob \| history
progs/trivial/SConscript	diff1 \|	diff2 \|	blob \| history
progs/trivial/tri-z-eq.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_surface.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/Makefile	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/SConscript	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_bld_arit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_bld_conv.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_bld_interp.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_bld_logic.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_bld_type.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_bld_type.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_draw_arrays.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_fence.c	diff1 \|	\|	blob \| history
src/gallium/drivers/llvmpipe/lp_jit.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_rast.c	diff1 \|	\|	blob \| history
src/gallium/drivers/llvmpipe/lp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_setup.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_setup_tri.c	diff1 \|	\|	blob \| history
src/gallium/drivers/llvmpipe/lp_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_blend.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_derived.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_fs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_rasterizer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_sampler.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_surface.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_tile_soa.h	diff1 \|	diff2 \|	blob \| history