Module: Mesa Branch: main Commit: 3f79b51dcd6bdb23eca5f7bbaaf0d9099977d038 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f79b51dcd6bdb23eca5f7bbaaf0d9099977d038
Author: Erik Faye-Lund <[email protected]> Date: Fri Jun 23 16:46:48 2023 +0200 aux/util: use unsigned instead of uint Reviewed-by: Yonggang Luo <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24002> --- src/gallium/auxiliary/util/u_blitter.c | 6 +++--- src/gallium/auxiliary/util/u_draw_quad.c | 12 ++++++------ src/gallium/auxiliary/util/u_draw_quad.h | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 5f0d9f6d157..643477c6f4e 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -386,7 +386,7 @@ static void bind_vs_pos_only(struct blitter_context_priv *ctx, struct pipe_stream_output_info so; static const enum tgsi_semantic semantic_names[] = { TGSI_SEMANTIC_POSITION }; - const uint semantic_indices[] = { 0 }; + const unsigned semantic_indices[] = { 0 }; memset(&so, 0, sizeof(so)); so.num_outputs = 1; @@ -410,7 +410,7 @@ static void *get_vs_passthrough_pos_generic(struct blitter_context *blitter) if (!ctx->vs) { static const enum tgsi_semantic semantic_names[] = { TGSI_SEMANTIC_POSITION, TGSI_SEMANTIC_GENERIC }; - const uint semantic_indices[] = { 0, 0 }; + const unsigned semantic_indices[] = { 0, 0 }; ctx->vs = util_make_vertex_passthrough_shader(pipe, 2, semantic_names, semantic_indices, false); @@ -426,7 +426,7 @@ static void *get_vs_passthrough_pos(struct blitter_context *blitter) if (!ctx->vs_nogeneric) { static const enum tgsi_semantic semantic_names[] = { TGSI_SEMANTIC_POSITION }; - const uint semantic_indices[] = { 0 }; + const unsigned semantic_indices[] = { 0 }; ctx->vs_nogeneric = util_make_vertex_passthrough_shader(pipe, 1, diff --git a/src/gallium/auxiliary/util/u_draw_quad.c b/src/gallium/auxiliary/util/u_draw_quad.c index 6f9eb397e80..b30b5f95fae 100644 --- a/src/gallium/auxiliary/util/u_draw_quad.c +++ b/src/gallium/auxiliary/util/u_draw_quad.c @@ -42,11 +42,11 @@ void util_draw_vertex_buffer(struct pipe_context *pipe, struct cso_context *cso, struct pipe_resource *vbuf, - uint vbuf_slot, - uint offset, + unsigned vbuf_slot, + unsigned offset, enum mesa_prim prim_type, - uint num_verts, - uint num_attribs) + unsigned num_verts, + unsigned num_attribs) { struct pipe_vertex_buffer vbuffer; @@ -76,8 +76,8 @@ util_draw_vertex_buffer(struct pipe_context *pipe, */ void util_draw_user_vertex_buffer(struct cso_context *cso, void *buffer, - enum mesa_prim prim_type, uint num_verts, - uint num_attribs) + enum mesa_prim prim_type, unsigned num_verts, + unsigned num_attribs) { struct pipe_vertex_buffer vbuffer = {0}; diff --git a/src/gallium/auxiliary/util/u_draw_quad.h b/src/gallium/auxiliary/util/u_draw_quad.h index 6bcef02aec5..edbc318e8b8 100644 --- a/src/gallium/auxiliary/util/u_draw_quad.h +++ b/src/gallium/auxiliary/util/u_draw_quad.h @@ -43,14 +43,14 @@ struct cso_context; extern void util_draw_vertex_buffer(struct pipe_context *pipe, struct cso_context *cso, - struct pipe_resource *vbuf, uint vbuf_slot, - uint offset, enum mesa_prim prim_type, - uint num_attribs, uint num_verts); + struct pipe_resource *vbuf, unsigned vbuf_slot, + unsigned offset, enum mesa_prim prim_type, + unsigned num_attribs, unsigned num_verts); void util_draw_user_vertex_buffer(struct cso_context *cso, void *buffer, - enum mesa_prim prim_type, uint num_verts, - uint num_attribs); + enum mesa_prim prim_type, unsigned num_verts, + unsigned num_attribs); #ifdef __cplusplus }
