Merge branch 'vbo_clean'

Conflicts:
	src/mesa/drivers/dri/r300/r300_draw.c

diff --cc src/mesa/drivers/dri/r300/r300_draw.c
index aedc6cfb2a1701d34a18927eee719efece6fe826,cebb9a10d8b8aed33c391955e9d31cf8ccb4cfc6..ab2287a5e253e821fa7a5053e3f2ab0fa161f162
--- 1/src/mesa/drivers/dri/r300/r300_draw.c
--- 2/src/mesa/drivers/dri/r300/r300_draw.c
+++ b/src/mesa/drivers/dri/r300/r300_draw.c
@@@ -466,23 -607,8 +608,15 @@@ static void r300DrawPrims(GLcontext *ct
                         GLuint min_index,
                         GLuint max_index)
  {
-       struct split_limits limits;
        GLboolean retval;
  
-       if (ib)
-               limits.max_verts = 0xffffffff;
-       else
-               limits.max_verts = 65535;
- 
-       limits.max_indices = 65535;
-       limits.max_vb_size = 1024*1024;
- 
 +      /* This check should get folded into just the places that
 +       * min/max index are really needed.
 +       */
-       if (!index_bounds_valid)
-          vbo_get_minmax_index(ctx, prim, ib, &min_index, &max_index);
++      if (!index_bounds_valid) {
++              vbo_get_minmax_index(ctx, prim, ib, &min_index, &max_index);
++      }
 +
        if (min_index) {
                vbo_rebase_prims( ctx, arrays, prim, nr_prims, ib, min_index, max_index, r300DrawPrims );
                return;