From 4656df5a65f2cd74a26097e4419f8bafd5beb0ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 1 Nov 2020 12:35:48 -0500 Subject: [PATCH] mesa: clean up Driver.Draw parameter types Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/drivers/dri/i965/brw_draw.c | 12 ++++++------ src/mesa/drivers/dri/i965/brw_draw.h | 12 ++++++------ src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c | 8 ++++---- src/mesa/main/dd.h | 8 ++++---- src/mesa/main/draw.c | 2 +- src/mesa/state_tracker/st_draw.c | 12 ++++++------ src/mesa/state_tracker/st_draw.h | 12 ++++++------ src/mesa/state_tracker/st_draw_feedback.c | 12 ++++++------ src/mesa/tnl/t_draw.c | 6 +++--- src/mesa/tnl/tnl.h | 6 +++--- src/mesa/vbo/vbo_exec_draw.c | 2 +- src/mesa/vbo/vbo_primitive_restart.c | 4 ++-- src/mesa/vbo/vbo_save_draw.c | 2 +- 13 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 25162ca..3f32f00 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -1134,13 +1134,13 @@ retry: void brw_draw_prims(struct gl_context *ctx, const struct _mesa_prim *prims, - GLuint nr_prims, + unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, - GLuint min_index, - GLuint max_index, - GLuint num_instances, - GLuint base_instance) + bool index_bounds_valid, + unsigned min_index, + unsigned max_index, + unsigned num_instances, + unsigned base_instance) { unsigned i; struct brw_context *brw = brw_context(ctx); diff --git a/src/mesa/drivers/dri/i965/brw_draw.h b/src/mesa/drivers/dri/i965/brw_draw.h index 9331d54..06f127b 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.h +++ b/src/mesa/drivers/dri/i965/brw_draw.h @@ -46,13 +46,13 @@ brw_emit_vertex_buffer_state(struct brw_context *brw, void brw_draw_prims(struct gl_context *ctx, const struct _mesa_prim *prims, - GLuint nr_prims, + unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, - GLuint min_index, - GLuint max_index, - GLuint num_instances, - GLuint base_instance); + bool index_bounds_valid, + unsigned min_index, + unsigned max_index, + unsigned num_instances, + unsigned base_instance); void brw_init_draw_functions(struct dd_function_table *functions); void brw_draw_init( struct brw_context *brw ); diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c index 9248d09..e27862d 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c @@ -542,11 +542,11 @@ TAG(vbo_check_render_prims)(struct gl_context *ctx, static void TAG(vbo_draw)(struct gl_context *ctx, - const struct _mesa_prim *prims, GLuint nr_prims, + const struct _mesa_prim *prims, unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, - GLuint min_index, GLuint max_index, - GLuint num_instances, GLuint base_instance) + bool index_bounds_valid, + unsigned min_index, unsigned max_index, + unsigned num_instances, unsigned base_instance) { /* Borrow and update the inputs list from the tnl context */ const struct tnl_vertex_array* arrays = _tnl_bind_inputs(ctx); diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index ae30f2b1..e668c2d 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -546,11 +546,11 @@ struct dd_function_table { * \param base_instance base instance from ARB_base_instance */ void (*Draw)(struct gl_context *ctx, - const struct _mesa_prim *prims, GLuint nr_prims, + const struct _mesa_prim *prims, unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, - GLuint min_index, GLuint max_index, - GLuint num_instances, GLuint base_instance); + bool index_bounds_valid, + unsigned min_index, unsigned max_index, + unsigned num_instances, unsigned base_instance); /** diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c index 0d7258e..570db90 100644 --- a/src/mesa/main/draw.c +++ b/src/mesa/main/draw.c @@ -365,7 +365,7 @@ _mesa_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start, }; ctx->Driver.Draw(ctx, &prim, 1, NULL, - GL_TRUE, start, start + count - 1, + true, start, start + count - 1, numInstances, baseInstance); if (MESA_DEBUG_FLAGS & DEBUG_ALWAYS_FLUSH) { diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 9f66614..16298e1 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -158,13 +158,13 @@ prepare_draw(struct st_context *st, struct gl_context *ctx) static void st_draw_vbo(struct gl_context *ctx, const struct _mesa_prim *prims, - GLuint nr_prims, + unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, - GLuint min_index, - GLuint max_index, - GLuint num_instances, - GLuint base_instance) + bool index_bounds_valid, + unsigned min_index, + unsigned max_index, + unsigned num_instances, + unsigned base_instance) { struct st_context *st = st_context(ctx); struct pipe_draw_info info; diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h index c87727d..ddb2d57 100644 --- a/src/mesa/state_tracker/st_draw.h +++ b/src/mesa/state_tracker/st_draw.h @@ -50,13 +50,13 @@ struct draw_context *st_get_draw_context(struct st_context *st); extern void st_feedback_draw_vbo(struct gl_context *ctx, const struct _mesa_prim *prims, - GLuint nr_prims, + unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, - GLuint min_index, - GLuint max_index, - GLuint num_instances, - GLuint base_instance); + bool index_bounds_valid, + unsigned min_index, + unsigned max_index, + unsigned num_instances, + unsigned base_instance); /** * When drawing with VBOs, the addresses specified with diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c index ef78f82..45d3255 100644 --- a/src/mesa/state_tracker/st_draw_feedback.c +++ b/src/mesa/state_tracker/st_draw_feedback.c @@ -95,13 +95,13 @@ set_feedback_vertex_format(struct gl_context *ctx) void st_feedback_draw_vbo(struct gl_context *ctx, const struct _mesa_prim *prims, - GLuint nr_prims, + unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, - GLuint min_index, - GLuint max_index, - GLuint num_instances, - GLuint base_instance) + bool index_bounds_valid, + unsigned min_index, + unsigned max_index, + unsigned num_instances, + unsigned base_instance) { struct st_context *st = st_context(ctx); struct pipe_context *pipe = st->pipe; diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c index cf23c01..5d1bc09 100644 --- a/src/mesa/tnl/t_draw.c +++ b/src/mesa/tnl/t_draw.c @@ -628,10 +628,10 @@ _tnl_bind_inputs(struct gl_context *ctx) */ void _tnl_draw(struct gl_context *ctx, - const struct _mesa_prim *prim, GLuint nr_prims, + const struct _mesa_prim *prim, unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, - GLuint num_instances, GLuint base_instance) + bool index_bounds_valid, unsigned min_index, unsigned max_index, + unsigned num_instances, unsigned base_instance) { /* Update TNLcontext::draw_arrays and return that pointer. */ diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h index 5c87ab6..56d541f 100644 --- a/src/mesa/tnl/tnl.h +++ b/src/mesa/tnl/tnl.h @@ -112,10 +112,10 @@ _tnl_draw_prims(struct gl_context *ctx, void _tnl_draw(struct gl_context *ctx, - const struct _mesa_prim *prim, GLuint nr_prims, + const struct _mesa_prim *prim, unsigned nr_prims, const struct _mesa_index_buffer *ib, - GLboolean index_bounds_valid, GLuint min_index, GLuint max_index, - GLuint num_instances, GLuint base_instance); + bool index_bounds_valid, unsigned min_index, unsigned max_index, + unsigned num_instances, unsigned base_instance); extern void _tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]); diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index ae14478..e454d23 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -325,7 +325,7 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec) exec->vtx.vert_count); ctx->Driver.Draw(ctx, exec->vtx.prim, exec->vtx.prim_count, - NULL, GL_TRUE, 0, exec->vtx.vert_count - 1, 1, 0); + NULL, true, 0, exec->vtx.vert_count - 1, 1, 0); /* Get new storage -- unless asked not to. */ if (!persistent_mapping) diff --git a/src/mesa/vbo/vbo_primitive_restart.c b/src/mesa/vbo/vbo_primitive_restart.c index 8dce7d6..3df8110 100644 --- a/src/mesa/vbo/vbo_primitive_restart.c +++ b/src/mesa/vbo/vbo_primitive_restart.c @@ -252,12 +252,12 @@ vbo_sw_primitive_restart(struct gl_context *ctx, temp_prim.count = MIN2(sub_end_index, end_index) - temp_prim.start; if ((temp_prim.start == sub_prim->start) && (temp_prim.count == sub_prim->count)) { - ctx->Driver.Draw(ctx, &temp_prim, 1, ib, GL_TRUE, + ctx->Driver.Draw(ctx, &temp_prim, 1, ib, true, sub_prim->min_index, sub_prim->max_index, num_instances, base_instance); } else { ctx->Driver.Draw(ctx, &temp_prim, 1, ib, - GL_FALSE, -1, -1, + false, -1, -1, num_instances, base_instance); } } diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 8df082f..397b07f 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -212,7 +212,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data) if (node->vertex_count > 0) { GLuint min_index = _vbo_save_get_min_index(node); GLuint max_index = _vbo_save_get_max_index(node); - ctx->Driver.Draw(ctx, node->prims, node->prim_count, NULL, GL_TRUE, + ctx->Driver.Draw(ctx, node->prims, node->prim_count, NULL, true, min_index, max_index, 1, 0); } } -- 2.7.4