Mesa (master): i965: Mark brw_draw_prims tfb_vertcount parameter as unused.

Kenneth Graunke kwg at kemper.freedesktop.org
Thu Oct 31 18:06:53 UTC 2013


Module: Mesa
Branch: master
Commit: b2ff11618fa6036744d8ab12730865b3adf81765
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2ff11618fa6036744d8ab12730865b3adf81765

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon May 27 11:41:21 2013 -0700

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 <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 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 0acd089..7b33b76 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 aac375f..fb96813 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 );




More information about the mesa-commit mailing list