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

author	Roland Scheidegger <sroland@vmware.com>
	Thu, 28 Jan 2010 16:23:58 +0000 (17:23 +0100)
committer	Roland Scheidegger <sroland@vmware.com>
	Thu, 28 Jan 2010 16:23:58 +0000 (17:23 +0100)
commit	9b346f83a7b672e913a7bb6a089d5dbd7fbdce06
tree	f5e4856c9d6fb4e57c4ddf6e64d5212f24c853ae	tree
parent	bd60e6cd5ce7c19e52338f12f73dfa1b622391d5	commit \| diff
parent	2fa34bf44c7cd7ba03ce8a7e82fe56898a57e9b4	commit \| diff

Merge commit 'origin/perrtblend'

Conflicts:
src/gallium/drivers/softpipe/sp_screen.c
src/gallium/include/pipe/p_defines.h

20 files changed:

src/gallium/auxiliary/util/u_blit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_gen_mipmap.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_fs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_test_blend.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_quad_blend.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_pipe_blend.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/tests/regress/fragment-shader/fragment-shader.py	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_composite.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_renderer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_xv.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_clear.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_extensions.c	diff1 \|	diff2 \|	blob \| history

src/gallium/auxiliary/util/u_blit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_gen_mipmap.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_fs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_test_blend.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_quad_blend.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_pipe_blend.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/tests/regress/fragment-shader/fragment-shader.py	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_composite.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_renderer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_xv.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_clear.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_extensions.c	diff1 \|	diff2 \|	blob \| history