From: Maciej Cencora <m.cencora@gmail.com>
Date: Fri, 14 Aug 2009 22:52:44 +0000 (+0200)
Subject: Merge branch 'vbo_clean'
X-Git-Tag: 062012170305~16970
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a89963cec1b5872d620c73ed8a5e54b10e3bf28b;p=profile%2Fivi%2Fmesa.git

Merge branch 'vbo_clean'

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

a89963cec1b5872d620c73ed8a5e54b10e3bf28b
diff --cc src/mesa/drivers/dri/r300/r300_draw.c
index aedc6cf,cebb9a1..ab2287a
--- a/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;