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

author	Roland Scheidegger <sroland@vmware.com>
	Fri, 21 May 2010 18:02:22 +0000 (20:02 +0200)
committer	Roland Scheidegger <sroland@vmware.com>
	Fri, 21 May 2010 18:02:22 +0000 (20:02 +0200)
commit	3293bcdc80cdfa20a2381aae2b94505bdf95d857
tree	16ab1ae66010f6d8b1325dbfa9006126a8e95771	tree
parent	8504c5d931e47765a15fdaec2df2cb6502a1bd5c	commit \| diff
parent	ce65caba846b03b5ef4144e311b85cfd48ab9bbb	commit \| diff

Merge branch 'gallium-msaa'

Conflicts:
src/mesa/state_tracker/st_gen_mipmap.c
src/mesa/state_tracker/st_texture.c

51 files changed:

src/gallium/auxiliary/util/u_blit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_blitter.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_gen_mipmap.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_surface.c	diff1 \|	diff2 \|	blob \| history
src/gallium/docs/source/context.rst	diff1 \|	diff2 \|	blob \| history
src/gallium/docs/source/screen.rst	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_pipe_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_resource.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_resource_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/identity/id_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nouveau/nouveau_screen.c	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/nvfx/nvfx_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nvfx/nvfx_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_context.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/r300/r300_transfer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/trace/tr_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/trace/tr_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_screen.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/egl/common/egl_g3d.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/vg_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/vg_manager.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_dri2.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_exa.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_renderer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/SConscript	diff1 \|	diff2 \|	blob \| history
src/mesa/sources.mak	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_atom_pixeltransfer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_bitmap.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_blit.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_bufferobjects.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_eglimage.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_texture.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_gen_mipmap.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_texture.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

src/gallium/auxiliary/util/u_blit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_blitter.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_gen_mipmap.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_surface.c	diff1 \|	diff2 \|	blob \| history
src/gallium/docs/source/context.rst	diff1 \|	diff2 \|	blob \| history
src/gallium/docs/source/screen.rst	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_pipe_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i915/i915_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_resource.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_resource_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/identity/id_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nouveau/nouveau_screen.c	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/nvfx/nvfx_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nvfx/nvfx_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_context.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/r300/r300_transfer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/trace/tr_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/trace/tr_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_screen.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/egl/common/egl_g3d.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/vg_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/vg_manager.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_dri2.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_exa.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_renderer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/SConscript	diff1 \|	diff2 \|	blob \| history
src/mesa/sources.mak	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_atom_pixeltransfer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_bitmap.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_blit.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_bufferobjects.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_eglimage.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_texture.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_gen_mipmap.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_texture.c	diff1 \|	diff2 \|	blob \| history