diff options
| author | Christian König <[email protected]> | 2011-01-20 22:43:18 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-20 22:43:18 +0100 |
| commit | 78faf8d0e9c276a0ff1465e501d58fb3d66de2f7 (patch) | |
| tree | 4e124bd6b511e408c5e113c4166b8fa97fd75b24 /src/mesa/tnl | |
| parent | d2ff6b8715e817c1ef14d4bf12be58c19d894143 (diff) | |
| parent | 37233f1ee0213a224611788bbab38840ba9f8308 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_draw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c index bdb893eba22..858b8281da3 100644 --- a/src/mesa/tnl/t_draw.c +++ b/src/mesa/tnl/t_draw.c @@ -468,6 +468,8 @@ void _tnl_draw_prims( struct gl_context *ctx, break; } + assert(prim[i].num_instances > 0); + /* Binding inputs may imply mapping some vertex buffer objects. * They will need to be unmapped below. */ |