From 114e078001b3bade76b80fe99e39d346e88b6a4a Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 7 Apr 2020 21:10:45 -0700 Subject: [PATCH] tnl: Silence unused parameter warnings in _tnl_draw_prims MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit A tangled mess of a couple parameters that nobody wanted. src/mesa/tnl/t_draw.c: In function ‘_tnl_draw_prims’: src/mesa/tnl/t_draw.c:440:42: warning: unused parameter ‘tfb_vertcount’ [-Wunused-parameter] 440 | struct gl_transform_feedback_object *tfb_vertcount, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~ src/mesa/tnl/t_draw.c:441:35: warning: unused parameter ‘stream’ [-Wunused-parameter] 441 | unsigned stream) | ~~~~~~~~~^~~~~~ Reviewed-by: Marek Olšák Part-of: --- src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c | 25 +++++++------------- src/mesa/tnl/t_draw.c | 10 ++++---- src/mesa/tnl/t_rebase.c | 3 +-- src/mesa/tnl/t_split_copy.c | 3 +-- src/mesa/tnl/t_split_inplace.c | 3 +-- src/mesa/tnl/tnl.h | 8 ++----- 6 files changed, 17 insertions(+), 35 deletions(-) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c index 720b7c3e1a0..8a7d0f4a338 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c @@ -244,9 +244,7 @@ TAG(vbo_render_prims)(struct gl_context *ctx, const struct _mesa_index_buffer *ib, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, - GLuint num_instances, GLuint base_instance, - struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream); + GLuint num_instances, GLuint base_instance); static GLboolean vbo_maybe_split(struct gl_context *ctx, const struct tnl_vertex_array *arrays, @@ -489,9 +487,7 @@ TAG(vbo_render_prims)(struct gl_context *ctx, const struct _mesa_index_buffer *ib, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, - GLuint num_instances, GLuint base_instance, - struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream) + GLuint num_instances, GLuint base_instance) { struct nouveau_render_state *render = to_render_state(ctx); @@ -527,9 +523,7 @@ TAG(vbo_check_render_prims)(struct gl_context *ctx, const struct _mesa_index_buffer *ib, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, - GLuint num_instances, GLuint base_instance, - struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream) + GLuint num_instances, GLuint base_instance) { struct nouveau_context *nctx = to_nouveau_context(ctx); @@ -538,14 +532,12 @@ TAG(vbo_check_render_prims)(struct gl_context *ctx, if (nctx->fallback == HWTNL) TAG(vbo_render_prims)(ctx, arrays, prims, nr_prims, ib, index_bounds_valid, min_index, max_index, - num_instances, base_instance, - tfb_vertcount, stream); + num_instances, base_instance); if (nctx->fallback == SWTNL) _tnl_draw_prims(ctx, arrays, prims, nr_prims, ib, index_bounds_valid, min_index, max_index, - num_instances, base_instance, - tfb_vertcount, stream); + num_instances, base_instance); } static void @@ -555,8 +547,8 @@ TAG(vbo_draw)(struct gl_context *ctx, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, GLuint num_instances, GLuint base_instance, - struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream) + UNUSED struct gl_transform_feedback_object *tfb_vertcount, + UNUSED unsigned stream) { /* Borrow and update the inputs list from the tnl context */ const struct tnl_vertex_array* arrays = _tnl_bind_inputs(ctx); @@ -564,8 +556,7 @@ TAG(vbo_draw)(struct gl_context *ctx, TAG(vbo_check_render_prims)(ctx, arrays, prims, nr_prims, ib, index_bounds_valid, min_index, max_index, - num_instances, base_instance, - tfb_vertcount, stream); + num_instances, base_instance); } void diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c index b60cec43e00..f790c0f3476 100644 --- a/src/mesa/tnl/t_draw.c +++ b/src/mesa/tnl/t_draw.c @@ -436,9 +436,7 @@ void _tnl_draw_prims(struct gl_context *ctx, GLuint min_index, GLuint max_index, GLuint num_instances, - GLuint base_instance, - struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream) + GLuint base_instance) { TNLcontext *tnl = TNL_CONTEXT(ctx); const GLuint TEST_SPLIT = 0; @@ -642,8 +640,8 @@ _tnl_draw(struct gl_context *ctx, const struct _mesa_index_buffer *ib, GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, GLuint num_instances, GLuint base_instance, - struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream) + UNUSED struct gl_transform_feedback_object *tfb_vertcount, + UNUSED unsigned stream) { /* Update TNLcontext::draw_arrays and return that pointer. */ @@ -651,7 +649,7 @@ _tnl_draw(struct gl_context *ctx, _tnl_draw_prims(ctx, arrays, prim, nr_prims, ib, index_bounds_valid, min_index, max_index, - num_instances, base_instance, tfb_vertcount, stream); + num_instances, base_instance); } diff --git a/src/mesa/tnl/t_rebase.c b/src/mesa/tnl/t_rebase.c index dc64e81fbd2..23395e4b576 100644 --- a/src/mesa/tnl/t_rebase.c +++ b/src/mesa/tnl/t_rebase.c @@ -247,8 +247,7 @@ void t_rebase_prims( struct gl_context *ctx, GL_TRUE, 0, max_index - min_index, - num_instances, base_instance, - NULL, 0); + num_instances, base_instance); free(tmp_indices); diff --git a/src/mesa/tnl/t_split_copy.c b/src/mesa/tnl/t_split_copy.c index 10f90b57d4d..9032238c58b 100644 --- a/src/mesa/tnl/t_split_copy.c +++ b/src/mesa/tnl/t_split_copy.c @@ -212,8 +212,7 @@ flush(struct copy_context *copy) 0, copy->dstbuf_nr - 1, 1, - 0, - NULL, 0); + 0); /* Reset all pointers: */ diff --git a/src/mesa/tnl/t_split_inplace.c b/src/mesa/tnl/t_split_inplace.c index 817b641e515..3ff9e01360b 100644 --- a/src/mesa/tnl/t_split_inplace.c +++ b/src/mesa/tnl/t_split_inplace.c @@ -96,8 +96,7 @@ flush_vertex( struct split_context *split) split->min_index, split->max_index, split->num_instances, - split->base_instance, - NULL, 0); + split->base_instance); split->dstprim_nr = 0; split->min_index = ~0; diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h index 4bf8ee20f68..58503016a9b 100644 --- a/src/mesa/tnl/tnl.h +++ b/src/mesa/tnl/tnl.h @@ -108,9 +108,7 @@ _tnl_draw_prims(struct gl_context *ctx, GLuint min_index, GLuint max_index, GLuint num_instances, - GLuint base_instance, - struct gl_transform_feedback_object *tfb_vertcount, - unsigned stream); + GLuint base_instance); void _tnl_draw(struct gl_context *ctx, @@ -176,9 +174,7 @@ typedef void (*tnl_draw_func)(struct gl_context *ctx, GLuint min_index, GLuint max_index, GLuint num_instances, - GLuint base_instance, - struct gl_transform_feedback_object *tfb_vertcount, - unsigned tfb_stream); + GLuint base_instance); /* Utility function to cope with various constraints on tnl modules or -- 2.30.2