diff options
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_draw.c | 11 | ||||
| -rw-r--r-- | src/mesa/tnl/tnl.h | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c index a83b98eede1..9814cdcec18 100644 --- a/src/mesa/tnl/t_draw.c +++ b/src/mesa/tnl/t_draw.c @@ -537,12 +537,12 @@ void _tnl_draw_prims(struct gl_context *ctx, } -void +const struct gl_vertex_array* _tnl_bind_inputs( struct gl_context *ctx ) { TNLcontext *tnl = TNL_CONTEXT(ctx); - _mesa_set_drawing_arrays(ctx, tnl->draw_arrays.inputs); _vbo_update_inputs(ctx, &tnl->draw_arrays); + return tnl->draw_arrays.inputs; } @@ -558,12 +558,11 @@ _tnl_draw(struct gl_context *ctx, struct gl_transform_feedback_object *tfb_vertcount, unsigned stream, struct gl_buffer_object *indirect) { - /* Update TNLcontext::draw_arrays and set that pointer - * into Array._DrawArrays. + /* Update TNLcontext::draw_arrays and return that pointer. */ - _tnl_bind_inputs(ctx); + const struct gl_vertex_array* arrays = _tnl_bind_inputs(ctx); - _tnl_draw_prims(ctx, ctx->Array._DrawArrays, prim, nr_prims, ib, + _tnl_draw_prims(ctx, arrays, prim, nr_prims, ib, index_bounds_valid, min_index, max_index, tfb_vertcount, stream, indirect); } diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h index e506aee6dfb..4b6d5ec3919 100644 --- a/src/mesa/tnl/tnl.h +++ b/src/mesa/tnl/tnl.h @@ -66,7 +66,7 @@ _tnl_wakeup( struct gl_context *ctx ); extern void _tnl_need_projected_coords( struct gl_context *ctx, GLboolean flag ); -extern void +extern const struct gl_vertex_array* _tnl_bind_inputs( struct gl_context *ctx ); |