From 100d8afbbdfbff1c871d60c8cd32e7762d8012f2 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 4 Jul 2022 08:59:54 -0700 Subject: [PATCH] freedreno: rename ir3_emit_driver_params() Driver-params are not VS specific, rename helper to reflect this. Signed-off-by: Rob Clark Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_const.c | 3 +-- src/gallium/drivers/freedreno/ir3/ir3_const.h | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_const.c b/src/gallium/drivers/freedreno/a6xx/fd6_const.c index c658b31ae00..a6c2df60282 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_const.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_const.c @@ -302,8 +302,7 @@ fd6_build_vs_driver_params(struct fd6_emit *emit) if (vs->need_driver_params) { struct fd_ringbuffer *dpconstobj = fd_submit_new_ringbuffer( ctx->batch->submit, (4 + IR3_DP_VS_COUNT) * 4, FD_RINGBUFFER_STREAMING); - ir3_emit_vs_driver_params(vs, dpconstobj, ctx, emit->info, emit->indirect, - emit->draw); + ir3_emit_driver_params(vs, dpconstobj, ctx, emit->info, emit->indirect, emit->draw); fd6_ctx->has_dp_state = true; return dpconstobj; } diff --git a/src/gallium/drivers/freedreno/ir3/ir3_const.h b/src/gallium/drivers/freedreno/ir3/ir3_const.h index 5f2402c5677..d4075b34973 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_const.h +++ b/src/gallium/drivers/freedreno/ir3/ir3_const.h @@ -450,11 +450,11 @@ emit_kernel_params(struct fd_context *ctx, const struct ir3_shader_variant *v, } static inline void -ir3_emit_vs_driver_params(const struct ir3_shader_variant *v, - struct fd_ringbuffer *ring, struct fd_context *ctx, - const struct pipe_draw_info *info, - const struct pipe_draw_indirect_info *indirect, - const struct pipe_draw_start_count_bias *draw) assert_dt +ir3_emit_driver_params(const struct ir3_shader_variant *v, + struct fd_ringbuffer *ring, struct fd_context *ctx, + const struct pipe_draw_info *info, + const struct pipe_draw_indirect_info *indirect, + const struct pipe_draw_start_count_bias *draw) assert_dt { assert(v->need_driver_params); @@ -500,7 +500,6 @@ ir3_emit_vs_driver_params(const struct ir3_shader_variant *v, pipe_buffer_create(&ctx->screen->base, PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STREAM, vertex_params_area * 4); unsigned src_off = indirect->offset; - ; void *ptr; ptr = fd_bo_map(fd_resource(vertex_params_rsc)->bo); @@ -546,7 +545,7 @@ ir3_emit_vs_consts(const struct ir3_shader_variant *v, /* emit driver params every time: */ if (info && v->need_driver_params) { ring_wfi(ctx->batch, ring); - ir3_emit_vs_driver_params(v, ring, ctx, info, indirect, draw); + ir3_emit_driver_params(v, ring, ctx, info, indirect, draw); } }