From 2f5ff9788a61fdbed43a510ce082940194aa2c8d Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Fri, 7 Mar 2025 11:02:13 +0800 Subject: [PATCH] Revert "gallium: add drawid_offset to draw_mesh_tasks interface" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 27cd4b061c8531863d9f61b63bef5b3197a7b117. It's always 0. Reviewed-by: Marek Olšák Part-of: --- src/gallium/auxiliary/driver_trace/tr_context.c | 4 +--- src/gallium/drivers/llvmpipe/lp_state_cs.c | 5 ++--- src/gallium/frontends/lavapipe/lvp_execute.c | 6 +++--- src/gallium/include/pipe/p_context.h | 1 - 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/gallium/auxiliary/driver_trace/tr_context.c b/src/gallium/auxiliary/driver_trace/tr_context.c index 7d093a251ac..2a78009d912 100644 --- a/src/gallium/auxiliary/driver_trace/tr_context.c +++ b/src/gallium/auxiliary/driver_trace/tr_context.c @@ -125,7 +125,6 @@ trace_context_draw_vbo(struct pipe_context *_pipe, static void trace_context_draw_mesh_tasks(struct pipe_context *_pipe, - unsigned drawid_offset, const struct pipe_grid_info *info) { struct trace_context *tr_ctx = trace_context(_pipe); @@ -134,14 +133,13 @@ trace_context_draw_mesh_tasks(struct pipe_context *_pipe, trace_dump_call_begin("pipe_context", "draw_mesh_tasks"); trace_dump_arg(ptr, pipe); - trace_dump_arg(uint, drawid_offset); trace_dump_arg(grid_info, info); trace_dump_trace_flush(); trace_dump_call_end(); - pipe->draw_mesh_tasks(pipe, drawid_offset, info); + pipe->draw_mesh_tasks(pipe, info); } diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c index 5f869386f86..2f9ef5b7da2 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_cs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c @@ -2111,7 +2111,6 @@ lp_mesh_call_draw(struct llvmpipe_context *lp, static void llvmpipe_draw_mesh_tasks(struct pipe_context *pipe, - unsigned drawid_offset, const struct pipe_grid_info *info) { struct llvmpipe_context *lp = llvmpipe_context(pipe); @@ -2195,7 +2194,7 @@ llvmpipe_draw_mesh_tasks(struct pipe_context *pipe, job_info.payload = payload; job_info.payload_stride = payload_stride; job_info.work_dim = info->work_dim; - job_info.draw_id = dr + drawid_offset; + job_info.draw_id = dr; job_info.req_local_mem = lp->tss->req_local_mem + info->variable_shared_mem; job_info.current = &lp->task_ctx->cs.current; @@ -2229,7 +2228,7 @@ llvmpipe_draw_mesh_tasks(struct pipe_context *pipe, job_info.req_local_mem = lp->mhs->req_local_mem + info->variable_shared_mem; job_info.current = &lp->mesh_ctx->cs.current; job_info.payload_stride = 0; - job_info.draw_id = dr + drawid_offset; + job_info.draw_id = dr; job_info.io_stride = task_out_size; uint32_t job_strides[3] = { job_info.grid_size[0], job_info.grid_size[1], job_info.grid_size[2] }; diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 94dd5148bce..373c8968d1c 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -3901,7 +3901,7 @@ static void handle_draw_mesh_tasks(struct vk_cmd_queue_entry *cmd, state->dispatch_info.grid_base[2] = 0; state->dispatch_info.draw_count = 1; state->dispatch_info.indirect = NULL; - state->pctx->draw_mesh_tasks(state->pctx, 0, &state->dispatch_info); + state->pctx->draw_mesh_tasks(state->pctx, &state->dispatch_info); } static void handle_draw_mesh_tasks_indirect(struct vk_cmd_queue_entry *cmd, @@ -3912,7 +3912,7 @@ static void handle_draw_mesh_tasks_indirect(struct vk_cmd_queue_entry *cmd, state->dispatch_info.indirect_offset = cmd->u.draw_mesh_tasks_indirect_ext.offset; state->dispatch_info.indirect_stride = cmd->u.draw_mesh_tasks_indirect_ext.stride; state->dispatch_info.draw_count = cmd->u.draw_mesh_tasks_indirect_ext.draw_count; - state->pctx->draw_mesh_tasks(state->pctx, 0, &state->dispatch_info); + state->pctx->draw_mesh_tasks(state->pctx, &state->dispatch_info); } static void handle_draw_mesh_tasks_indirect_count(struct vk_cmd_queue_entry *cmd, @@ -3925,7 +3925,7 @@ static void handle_draw_mesh_tasks_indirect_count(struct vk_cmd_queue_entry *cmd state->dispatch_info.draw_count = cmd->u.draw_mesh_tasks_indirect_count_ext.max_draw_count; state->dispatch_info.indirect_draw_count_offset = cmd->u.draw_mesh_tasks_indirect_count_ext.count_buffer_offset; state->dispatch_info.indirect_draw_count = lvp_buffer_from_handle(cmd->u.draw_mesh_tasks_indirect_count_ext.count_buffer)->bo; - state->pctx->draw_mesh_tasks(state->pctx, 0, &state->dispatch_info); + state->pctx->draw_mesh_tasks(state->pctx, &state->dispatch_info); } static VkBuffer diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h index 9868ea12acc..dbdf55b6fce 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -1039,7 +1039,6 @@ struct pipe_context { const struct pipe_grid_info *info); void (*draw_mesh_tasks)(struct pipe_context *context, - unsigned drawid_offset, const struct pipe_grid_info *info); /*@}*/