From b2ff11618fa6036744d8ab12730865b3adf81765 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 27 May 2013 11:41:21 -0700 Subject: [PATCH] i965: Mark brw_draw_prims tfb_vertcount parameter as unused. Renaming it makes it obvious that it isn't used, and the assertion verifies that the VBO module never passes us such an object. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_draw.c | 4 +++- src/mesa/drivers/dri/i965/brw_draw.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 0acd089bcde..7b33b76e75a 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -463,11 +463,13 @@ void brw_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 *unused_tfb_object) { struct brw_context *brw = brw_context(ctx); const struct gl_client_array **arrays = ctx->Array._DrawArrays; + assert(unused_tfb_object == NULL); + if (!_mesa_check_conditional_render(ctx)) return; diff --git a/src/mesa/drivers/dri/i965/brw_draw.h b/src/mesa/drivers/dri/i965/brw_draw.h index aac375f8a87..fb96813b70f 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.h +++ b/src/mesa/drivers/dri/i965/brw_draw.h @@ -41,7 +41,7 @@ void brw_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 *unused_tfb_object); void brw_draw_init( struct brw_context *brw ); void brw_draw_destroy( struct brw_context *brw ); -- 2.11.0