git.libre-soc.org Git - mesa.git/commit - progs/samples/rgbtoppm.c

Merge branch 'master' into pipe-format-simplify

Conflicts:
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
src/gallium/auxiliary/util/u_blit.c
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/auxiliary/util/u_surface.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/cell/ppu/cell_texture.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_tile_cache.c
src/gallium/drivers/svga/svga_state_vs.c
src/gallium/include/pipe/p_format.h
src/gallium/state_trackers/dri/dri_drawable.c
src/gallium/state_trackers/egl/egl_surface.c
src/gallium/state_trackers/python/p_device.i
src/gallium/state_trackers/python/st_softpipe_winsys.c
src/gallium/state_trackers/vega/api_filters.c
src/gallium/state_trackers/vega/image.c
src/gallium/state_trackers/vega/mask.c
src/gallium/state_trackers/vega/paint.c
src/gallium/state_trackers/vega/renderer.c
src/gallium/state_trackers/vega/vg_tracker.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_dri2.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/gallium/state_trackers/xorg/xvmc/surface.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/radeon/core/radeon_buffer.c
src/gallium/winsys/egl_xlib/sw_winsys.c
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c
src/gallium/winsys/gdi/gdi_softpipe_winsys.c
src/gallium/winsys/xlib/xlib_cell.c
src/gallium/winsys/xlib/xlib_llvmpipe.c
src/gallium/winsys/xlib/xlib_softpipe.c
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_cb_texture.c
src/mesa/state_tracker/st_texture.c

author	Michal Krol <michal@vmware.com>
	Thu, 17 Dec 2009 21:37:15 +0000 (22:37 +0100)
committer	Michal Krol <michal@vmware.com>
	Thu, 17 Dec 2009 21:37:15 +0000 (22:37 +0100)
commit	16c6dce013f089d072256652f012b3b604781bfd
tree	077623708990a855f9be2dfeb3925f727e6207e7	tree
parent	440fc5bf788201a265892ff2e12bf102e63a2896	commit \| diff
parent	294bd53d4b6b15a6890599c46f14b205a3c738bf	commit \| diff

src/gallium/auxiliary/draw/draw_pipe_aaline.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_pipe_pstipple.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_blit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_format.h	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_format_table.py	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_gen_mipmap.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_pack_color.h	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_surface.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/cell/ppu/cell_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/llvmpipe/lp_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv50/nv50_tex.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_emit.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_tile_cache.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_screen_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_format.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/dri/dri_drawable.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/egl/egl_surface.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/p_device.i	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/st_softpipe_winsys.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/api_filters.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/image.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/mask.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/paint.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/renderer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/vega/vg_tracker.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/wgl/stw_framebuffer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_crtc.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/gallium/state_trackers/xorg/xorg_xv.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/egl_xlib/sw_winsys.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/gdi/gdi_softpipe_winsys.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/xlib/xlib_cell.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/xlib/xlib_llvmpipe.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/xlib/xlib_softpipe.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_fbo.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_texture.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_format.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_texture.c	diff1 \|	diff2 \|	blob \| history