From fb6dccc64ccd4917c977023d533e2bdaa10fcd23 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 21 Oct 2025 16:33:49 -0700 Subject: [PATCH] freedreno: flip template param order Prep for next patch. We need the per-gen CHIP template param to be last. Signed-off-by: Rob Clark Part-of: --- .../drivers/freedreno/a6xx/fd6_const.cc | 20 +++++++++---------- .../drivers/freedreno/a6xx/fd6_const.h | 4 ++-- .../drivers/freedreno/a6xx/fd6_draw.cc | 4 ++-- .../drivers/freedreno/a6xx/fd6_emit.cc | 14 ++++++------- src/gallium/drivers/freedreno/a6xx/fd6_emit.h | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_const.cc b/src/gallium/drivers/freedreno/a6xx/fd6_const.cc index b253220ab0c..44f4aea6c5e 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_const.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_const.cc @@ -335,7 +335,7 @@ emit_user_consts(const struct ir3_shader_variant *v, fd_cs &cs, ir3_emit_user_consts(v, cs.ring(), constbuf); } -template +template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit) { @@ -359,10 +359,10 @@ fd6_build_user_consts(struct fd6_emit *emit) return constobj.ring(); } -template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit); -template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit); -template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit); -template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit); +template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit); +template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit); +template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit); +template struct fd_ringbuffer * fd6_build_user_consts(struct fd6_emit *emit); template static inline void @@ -401,7 +401,7 @@ emit_hs_driver_params(const struct ir3_shader_variant *v, fd_cs &dpconstobj, } } -template +template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit) { @@ -467,10 +467,10 @@ fd6_build_driver_params(struct fd6_emit *emit) return dpconstobj.ring(); } -template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit); -template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit); -template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit); -template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit); +template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit); +template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit); +template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit); +template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit); template void diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_const.h b/src/gallium/drivers/freedreno/a6xx/fd6_const.h index 962b7a948c8..dce3bd4375c 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_const.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_const.h @@ -14,10 +14,10 @@ struct fd_ringbuffer *fd6_build_tess_consts(struct fd6_emit *emit) assert_dt; template unsigned fd6_user_consts_cmdstream_size(const struct ir3_shader_variant *v); -template +template struct fd_ringbuffer *fd6_build_user_consts(struct fd6_emit *emit) assert_dt; -template +template struct fd_ringbuffer * fd6_build_driver_params(struct fd6_emit *emit) assert_dt; diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_draw.cc b/src/gallium/drivers/freedreno/a6xx/fd6_draw.cc index 7f7a52526fc..c2489591905 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_draw.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_draw.cc @@ -461,7 +461,7 @@ draw_vbos(struct fd_context *ctx, const struct pipe_draw_info *info, } if (emit.dirty_groups) - fd6_emit_3d_state(cs, &emit); + fd6_emit_3d_state(cs, &emit); /* All known firmware versions do not wait for WFI's with CP_DRAW_AUTO. * Plus, for the common case where the counter buffer is written by @@ -539,7 +539,7 @@ draw_vbos(struct fd_context *ctx, const struct pipe_draw_info *info, emit.state.num_groups = 0; emit.draw = &draws[i]; emit.draw_id = info->increment_draw_id ? i : 0; - fd6_emit_3d_state(cs, &emit); + fd6_emit_3d_state(cs, &emit); } assert(!index_offset); /* handled by util_draw_multi() */ diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.cc b/src/gallium/drivers/freedreno/a6xx/fd6_emit.cc index 5d833fe34d0..3c09ea0ad46 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.cc @@ -552,7 +552,7 @@ build_prim_mode(struct fd6_emit *emit, struct fd_context *ctx, bool gmem) .ring(); } -template +template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit) { @@ -655,11 +655,11 @@ fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit) fd6_state_take_group(&emit->state, state, FD6_GROUP_FS_BINDLESS); break; case FD6_GROUP_CONST: - state = fd6_build_user_consts(emit); + state = fd6_build_user_consts(emit); fd6_state_take_group(&emit->state, state, FD6_GROUP_CONST); break; case FD6_GROUP_DRIVER_PARAMS: - state = fd6_build_driver_params(emit); + state = fd6_build_driver_params(emit); fd6_state_take_group(&emit->state, state, FD6_GROUP_DRIVER_PARAMS); break; case FD6_GROUP_PRIMITIVE_PARAMS: @@ -710,10 +710,10 @@ fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit) fd6_state_emit(&emit->state, cs); } -template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit); -template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit); -template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit); -template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit); +template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit); +template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit); +template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit); +template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit); template void diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h index 13edfe00ece..6000a985428 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h @@ -353,7 +353,7 @@ fd6_gl2spacing(enum gl_tess_spacing spacing) } } -template +template void fd6_emit_3d_state(fd_cs &cs, struct fd6_emit *emit) assert_dt; struct fd6_compute_state;