projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e7f881 6749310)
Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 25 Jan 2010 21:46:17 +0000 (14:46 -0700)
committerBrian Paul <brianp@vmware.com>
Mon, 25 Jan 2010 21:46:17 +0000 (14:46 -0700)
commit9b22427911ad27efc1f36faee9462c6082d0417c
tree12e5a6c336e4ca2a71b754120dfcc183f09ae58ctree
parent7e7f8815fbfa21ab2397e673fa19c36603bc7a51commit | diff
parent6749310d3f60df70ad8f82db986871ab9496793bcommit | diff
Merge branch 'mesa_7_7_branch'

Conflicts:

src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_swapbuffers.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
67 files changed:
SConstruct diff1 | diff2 | blob | history
progs/demos/shadowtex.c diff1 | diff2 | blob | history
scons/gallium.py diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_tile.c diff1 | diff2 | blob | history
src/gallium/state_trackers/vega/shader.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_dri2.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_tracker.h diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i830_context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i915_context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i915_vtbl.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/intel_tris.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_cc.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_clip_line.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_clip_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_clip_tri.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_clip_util.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_draw.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_draw_upload.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_fallback.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_gs_emit.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_gs_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_sf_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_vs_surface_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_vtbl.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_wm.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_blit.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_buffers.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_clear.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_pixel.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_pixel_draw.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_pixel_read.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_regions.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_screen.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_tex_copy.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_tex_image.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mga/mga_xmesa.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mga/mgaioctl.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mga/mgatex.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_cmdbuf.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_draw.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_emit.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_fragprog_common.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_tex.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_texstate.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_vertprog.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/savage/savageioctl.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/savage/savagerender.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/savage/savagespan.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/savage/savagetex.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/savage/savagetris.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/sis/sis_context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/sis/sis_screen.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/sis/sis_texstate.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/sis/sis_tris.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/tdfx/tdfx_lock.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/tdfx/tdfx_pixels.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/tdfx/tdfx_screen.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/tdfx/tdfx_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/tdfx/tdfx_vb.c diff1 | diff2 | blob | history
src/mesa/glapi/gl_x86_asm.py diff1 | diff2 | blob | history
src/mesa/x86/glapi_x86.S diff1 | diff2 | blob | history