summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2011-02-28 01:54:36 +0100
committerChristian König <deathsimple@vodafone.de>2011-02-28 02:19:39 +0100
commitbce4f9ac395986ee0acae2702ed73448333d81b8 (patch)
tree4b62e85bee6d4a483dc63066eff4f2a06d5e9cb4 /src/mesa/state_tracker
parent0a17444133e74de7bc5d04d8ffc8f29b89f0cf58 (diff)
st/mesa & v_bug_mgr: two small instanced drawing fixes
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_draw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 6530a06ade4..c99eafbadf3 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/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);
}
}