OSDN Git Service

Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 31 Dec 2009 16:02:27 +0000 (09:02 -0700)
committerBrian Paul <brianp@vmware.com>
Thu, 31 Dec 2009 16:02:27 +0000 (09:02 -0700)
commit25024d948298a9f3f3210a0b91486f79a3917b0f
tree5647623b9781193b7ed55c8d9233404938aeb853
parentd14beea534dcb2b3ae2ae1f7ee0ba5dcdef3dba3
parent195e7657e2f15f7ad8b22042b86bcf33c5bba76b
Merge branch 'mesa_7_7_branch'

Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
26 files changed:
configs/darwin
progs/demos/geartrain.c
progs/demos/isosurf.c
progs/demos/terrain.c
src/gallium/auxiliary/tgsi/tgsi_ureg.c
src/gallium/auxiliary/util/u_debug.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/trace/tr_context.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/egl/egl_surface.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/mesa/drivers/dri/i965/brw_disasm.c
src/mesa/drivers/dri/i965/brw_eu_emit.c
src/mesa/drivers/dri/i965/brw_wm_emit.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
src/mesa/main/texgetimage.c
src/mesa/shader/slang/slang_compile.c
src/mesa/state_tracker/st_format.c
src/mesa/swrast/s_span.c