From c73a76195ce6bba7ff485f80d846027a96e5b86b Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 1 Jan 2023 07:31:56 -0800 Subject: [PATCH] freedreno/a6xx: Rename fd6_emit_3d_state() To better reflect this is emitting 3d state, and to avoid a name conflict in the next patch. Signed-off-by: Rob Clark Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_draw.c | 2 +- src/gallium/drivers/freedreno/a6xx/fd6_emit.c | 2 +- src/gallium/drivers/freedreno/a6xx/fd6_emit.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_draw.c b/src/gallium/drivers/freedreno/a6xx/fd6_draw.c index 3ce6e7d5e2c..829f9ddb3be 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_draw.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_draw.c @@ -301,7 +301,7 @@ fd6_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info, // TODO move fd6_emit_streamout.. I think.. if (emit.dirty_groups) - fd6_emit_state(ring, &emit); + fd6_emit_3d_state(ring, &emit); /* for debug after a lock up, write a unique counter value * to scratch7 for each draw, to make it easier to match up diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c index a9fc5528bb2..f74e5e5a74d 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c @@ -802,7 +802,7 @@ fd6_emit_non_ring(struct fd_ringbuffer *ring, struct fd6_emit *emit) assert_dt } void -fd6_emit_state(struct fd_ringbuffer *ring, struct fd6_emit *emit) +fd6_emit_3d_state(struct fd_ringbuffer *ring, struct fd6_emit *emit) { struct fd_context *ctx = emit->ctx; struct pipe_framebuffer_state *pfb = &ctx->batch->framebuffer; diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h index 610bee08062..efe4c6bf59d 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h @@ -281,8 +281,8 @@ void fd6_emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring, struct fd_texture_stateobj *tex, const struct ir3_shader_variant *v) assert_dt; -void fd6_emit_state(struct fd_ringbuffer *ring, - struct fd6_emit *emit) assert_dt; +void fd6_emit_3d_state(struct fd_ringbuffer *ring, + struct fd6_emit *emit) assert_dt; void fd6_emit_cs_state(struct fd_context *ctx, struct fd_ringbuffer *ring, struct ir3_shader_variant *cp) assert_dt;