From ec3011ed0470d90987a35cb3be751cd20c64f0ca Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sun, 20 Apr 2025 17:44:58 +0200 Subject: [PATCH] gallium: remove pipe_grid_info::input MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Mike Blumenkrantz Reviewed-by: Marek Olšák Reviewed-by: Alyssa Rosenzweig Reviewed-by: Mary Guillemard Reviewed-by: Jose Maria Casanova Crespo Part-of: --- src/gallium/auxiliary/driver_trace/tr_dump_state.c | 1 - src/gallium/auxiliary/util/u_dump_state.c | 1 - src/gallium/auxiliary/util/u_threaded_context.c | 1 - src/gallium/include/pipe/p_state.h | 6 ------ 4 files changed, 9 deletions(-) diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.c b/src/gallium/auxiliary/driver_trace/tr_dump_state.c index 5f8eb665ffc..505b1ecb08b 100644 --- a/src/gallium/auxiliary/driver_trace/tr_dump_state.c +++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.c @@ -1164,7 +1164,6 @@ void trace_dump_grid_info(const struct pipe_grid_info *state) trace_dump_struct_begin("pipe_grid_info"); - trace_dump_member(ptr, state, input); trace_dump_member(uint, state, variable_shared_mem); trace_dump_member_begin("block"); diff --git a/src/gallium/auxiliary/util/u_dump_state.c b/src/gallium/auxiliary/util/u_dump_state.c index 5dde46e6f8d..0b061923aac 100644 --- a/src/gallium/auxiliary/util/u_dump_state.c +++ b/src/gallium/auxiliary/util/u_dump_state.c @@ -976,7 +976,6 @@ void util_dump_grid_info(FILE *stream, const struct pipe_grid_info *state) util_dump_struct_begin(stream, "pipe_grid_info"); - util_dump_member(stream, ptr, state, input); util_dump_member(stream, uint, state, work_dim); util_dump_member_begin(stream, "block"); diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c index 185d639ab23..0bb431c57af 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.c +++ b/src/gallium/auxiliary/util/u_threaded_context.c @@ -4415,7 +4415,6 @@ tc_launch_grid(struct pipe_context *_pipe, struct threaded_context *tc = threaded_context(_pipe); struct tc_launch_grid_call *p = tc_add_call(tc, TC_CALL_launch_grid, tc_launch_grid_call); - assert(info->input == NULL); tc_set_resource_reference(&p->info.indirect, info->indirect); memcpy(&p->info, info, sizeof(*info)); diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index a41dd29c92d..dfd18d83ca1 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -940,12 +940,6 @@ struct pipe_blit_info */ struct pipe_grid_info { - /** - * Will be used to initialize the INPUT resource, and it should point to a - * buffer of at least pipe_compute_state::req_input_mem bytes. - */ - const void *input; - /** * Variable shared memory used by this invocation. *