Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Mon, 19 Apr 2010 14:45:20 +0000 (08:45 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 19 Apr 2010 14:45:20 +0000 (08:45 -0600)
commit8f3bdeaad610d7d5a5c6e73e1e9c721219595754
tree3375ac7eb94edf1914da7faafcedea32a2bd505b
parentf7c2d4fee3104008c21078879cbc5720d7bc1be6
parente3a34cc7f6c9f959cdc2af4486e84587fab4d0d7
Merge branch '7.8'

Conflicts:

src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/drivers/llvmpipe/lp_context.c
20 files changed:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_context.h
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/auxiliary/draw/draw_pipe_wide_point.c
src/gallium/auxiliary/draw/draw_private.h
src/gallium/drivers/i915/i915_context.c
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/llvmpipe/lp_context.c
src/gallium/drivers/llvmpipe/lp_state_rasterizer.c
src/gallium/drivers/nv50/nv50_context.c
src/gallium/drivers/nvfx/nvfx_context.c
src/gallium/drivers/nvfx/nvfx_state_emit.c
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_setup.c
src/gallium/drivers/svga/svga_swtnl_draw.c
src/gallium/drivers/svga/svga_swtnl_state.c
src/mesa/state_tracker/st_context.c
src/mesa/state_tracker/st_draw_feedback.c