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

author	Michal Krol <michal@vmware.com>
	Wed, 10 Mar 2010 14:49:30 +0000 (15:49 +0100)
committer	Michal Krol <michal@vmware.com>
	Wed, 10 Mar 2010 14:49:30 +0000 (15:49 +0100)
commit	3ce4375912c8ea488460e593e07c5bb15b92dca9
tree	1011fa439bd829fd46a44fd99478135848800e73	tree
parent	f59f28093ea827bd234d8e1a36bdd56a9fce5f09	commit \| diff
parent	9b348d0ed125a22be3f318ac60cef6f201edfdab	commit \| diff

Merge branch 'master' into gallium-sampler-view

Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c

52 files changed:

src/gallium/auxiliary/Makefile	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/SConscript	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/cso_cache/cso_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_blitter.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_blitter.h	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_inlines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_tile.c	diff1 \|	diff2 \|	blob \| history
src/gallium/docs/source/context.rst	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_pipe_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/failover/fo_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/failover/fo_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/failover/fo_state_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state_sampler.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_wm.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_wm_sampler_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/identity/id_context.c	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_setup.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_setup.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_fs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv30/nv30_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv30/nv30_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv40/nv40_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv40/nv40_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_tex.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_blit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_pipe_sampler.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/trace/tr_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_context.h	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/p_context.i	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/st_device.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/st_device.h	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

src/gallium/auxiliary/Makefile	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/SConscript	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/cso_cache/cso_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_blitter.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_blitter.h	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_inlines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_tile.c	diff1 \|	diff2 \|	blob \| history
src/gallium/docs/source/context.rst	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_pipe_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/failover/fo_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/failover/fo_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/failover/fo_state_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state_sampler.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_wm.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_wm_sampler_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/identity/id_context.c	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_setup.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_setup.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_state_fs.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv30/nv30_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv30/nv30_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv40/nv40_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv40/nv40_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_tex.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_blit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_context.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_pipe_sampler.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/trace/tr_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_context.h	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/p_context.i	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/st_device.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/st_device.h	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	diff1 \|	diff2 \|	blob \| history