Merge branch 'gallium-index-bias'

diff --cc src/gallium/auxiliary/draw/draw_context.c
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_context.h
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_private.h
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_pt.c
Simple merge

diff --cc src/gallium/drivers/i915/i915_context.c
Simple merge

diff --cc src/gallium/drivers/nvfx/nvfx_vbo.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_render.c
Simple merge

diff --cc src/gallium/drivers/svga/svga_swtnl_draw.c
Simple merge

diff --cc src/mesa/state_tracker/st_draw_feedback.c
Simple merge