diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-28 12:47:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-28 12:47:32 +0000 |
| commit | 717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed (patch) | |
| tree | 1512dddc255b89d5d3ec35bfc541a357184a7d7f /mesalib/src/mesa/state_tracker/st_draw.c | |
| parent | 46ff5affddfec90a099d55945ab2f857a5a75e57 (diff) | |
| parent | feee2b5ceb37101bd1c4162e49805e6ad63e28ae (diff) | |
| download | vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.tar.gz vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.tar.bz2 vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_draw.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_draw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c index 16cd92c6b..28186378f 100644 --- a/mesalib/src/mesa/state_tracker/st_draw.c +++ b/mesalib/src/mesa/state_tracker/st_draw.c @@ -579,6 +579,7 @@ st_validate_varrays(struct gl_context *ctx, if (is_interleaved_arrays(vp, vpv, arrays)) {
setup_interleaved_attribs(ctx, vp, vpv, arrays, vbuffer, velements,
max_index);
+
num_vbuffers = 1;
num_velements = vpv->num_inputs;
if (num_velements == 0)
@@ -645,6 +646,7 @@ st_draw_vbo(struct gl_context *ctx, for (i = 0; i < nr_prims; i++) {
min_index = MIN2(min_index, prims[i].start);
max_index = MAX2(max_index, prims[i].start + prims[i].count - 1);
+ max_index = MAX2(max_index, prims[i].num_instances);
}
}
|