r300: remove broken vertex splitting

Revert to previous behaviour of dropping to big render operations.
This commit is contained in:
Maciej Cencora 2009-08-14 17:04:08 +02:00
parent 9e018d8225
commit cdaf63d0ea
2 changed files with 5 additions and 13 deletions

View file

@ -594,25 +594,12 @@ static void r300DrawPrims(GLcontext *ctx,
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;
if (min_index) {
vbo_rebase_prims( ctx, arrays, prim, nr_prims, ib, min_index, max_index, r300DrawPrims );
return;
}
if ((ib && ib->count > 65535)) {
vbo_split_prims (ctx, arrays, prim, nr_prims, ib, min_index, max_index, r300DrawPrims, &limits);
return;
}
/* Make an attempt at drawing */
retval = r300TryDrawPrims(ctx, arrays, prim, nr_prims, ib, min_index, max_index);

View file

@ -337,6 +337,11 @@ void r300RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim)
if (type < 0 || num_verts <= 0)
return;
if (num_verts > 65535) {
WARN_ONCE("Can't handle more then 65535 vertices at once\n");
return;
}
/* Make space for at least 128 dwords.
* This is supposed to ensure that we can get all rendering
* commands into a single command buffer.