diff options
author | Christoph Bumiller <[email protected]> | 2013-04-05 12:12:08 +0200 |
---|---|---|
committer | Chris Forbes <[email protected]> | 2013-11-25 22:01:35 +1300 |
commit | 80ac616fca709ab10f7aae062d96ec18d05097a7 (patch) | |
tree | b144d9b4029a3ded710cbfe73d5c0dcf5f617ab9 /src/mesa/tnl | |
parent | eb0892b4b115a36ffb9f0904e418ec62a182427c (diff) |
mesa: add indirect drawing buffer parameter to draw functions
Split from patch implementing ARB_draw_indirect.
v2: Const-qualify the struct gl_buffer_object *indirect argument.
v3: Fix up some more draw calls for new argument.
v4: Fix up rebase conflicts in i965.
v5: Undo const-qualification
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r-- | src/mesa/tnl/t_draw.c | 3 | ||||
-rw-r--r-- | src/mesa/tnl/tnl.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c index 637ac6f9cfb..d6b09005e83 100644 --- a/src/mesa/tnl/t_draw.c +++ b/src/mesa/tnl/t_draw.c @@ -415,7 +415,8 @@ void _tnl_vbo_draw_prims(struct gl_context *ctx, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, - struct gl_transform_feedback_object *tfb_vertcount) + struct gl_transform_feedback_object *tfb_vertcount, + struct gl_buffer_object *indirect) { const struct gl_client_array **arrays = ctx->Array._DrawArrays; diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h index 162b7abd735..86ef5057e87 100644 --- a/src/mesa/tnl/tnl.h +++ b/src/mesa/tnl/tnl.h @@ -92,7 +92,8 @@ _tnl_vbo_draw_prims( struct gl_context *ctx, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, - struct gl_transform_feedback_object *tfb_vertcount ); + struct gl_transform_feedback_object *tfb_vertcount, + struct gl_buffer_object *indirect ); extern void _tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]); |