diff options
| -rw-r--r-- | src/mesa/state_tracker/st_atom_array.c | 7 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 28 |
3 files changed, 12 insertions, 25 deletions
diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c index 1327a196eff..c7467eb20b7 100644 --- a/src/mesa/state_tracker/st_atom_array.c +++ b/src/mesa/state_tracker/st_atom_array.c @@ -555,6 +555,9 @@ setup_interleaved_attribs(struct st_context *st, vbuffer.is_user_buffer = !!low_addr; /* if NULL, then unbind */ vbuffer.buffer_offset = 0; vbuffer.stride = stride; + + if (low_addr) + st->draw_needs_minmax_index = true; } set_vertex_attribs(st, &vbuffer, num_inputs ? 1 : 0, @@ -647,6 +650,9 @@ setup_non_interleaved_attribs(struct st_context *st, vbuffer[bufidx].buffer.user = array->Ptr; vbuffer[bufidx].is_user_buffer = true; vbuffer[bufidx].buffer_offset = 0; + + if (!array->InstanceDivisor) + st->draw_needs_minmax_index = true; } } @@ -681,6 +687,7 @@ void st_update_array(struct st_context *st) unsigned num_inputs; st->vertex_array_out_of_memory = FALSE; + st->draw_needs_minmax_index = false; /* No drawing has been done yet, so do nothing. */ if (!arrays) diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 68fd9b9d3d2..520cd8d4623 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -120,7 +120,7 @@ struct st_context * on glViewpport calls, this is set via a option. */ boolean invalidate_on_gl_viewport; - + boolean draw_needs_minmax_index; boolean vertex_array_out_of_memory; /* Some state is contained in constant objects. diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 15c5b80f291..019001fd6f2 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -67,25 +67,6 @@ /** - * This is very similar to vbo_all_varyings_in_vbos() but we are - * only interested in per-vertex data. See bug 38626. - */ -static GLboolean -all_varyings_in_vbos(const struct gl_vertex_array *arrays[]) -{ - GLuint i; - - for (i = 0; i < VERT_ATTRIB_MAX; i++) - if (arrays[i]->StrideB && - !arrays[i]->InstanceDivisor && - !_mesa_is_bufferobj(arrays[i]->BufferObj)) - return GL_FALSE; - - return GL_TRUE; -} - - -/** * Set the restart index. */ static void @@ -161,7 +142,6 @@ st_draw_vbo(struct gl_context *ctx, { struct st_context *st = st_context(ctx); struct pipe_draw_info info; - const struct gl_vertex_array **arrays = ctx->Array._DrawArrays; unsigned i; unsigned start = 0; @@ -180,10 +160,10 @@ st_draw_vbo(struct gl_context *ctx, struct gl_buffer_object *bufobj = ib->obj; /* Get index bounds for user buffers. */ - if (!index_bounds_valid) - if (!all_varyings_in_vbos(arrays)) - vbo_get_minmax_indices(ctx, prims, ib, &min_index, &max_index, - nr_prims); + if (!index_bounds_valid && st->draw_needs_minmax_index) { + vbo_get_minmax_indices(ctx, prims, ib, &min_index, &max_index, + nr_prims); + } info.index_size = ib->index_size; info.min_index = min_index; |