From 9b420f7704bb66054638ecaf1c6fb84dc102f7db Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 21 Oct 2022 15:05:16 -0400 Subject: [PATCH] zink: simplify some program descriptor helpers Part-of: --- src/gallium/drivers/zink/zink_program.c | 8 ++++---- src/gallium/drivers/zink/zink_program.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 236106d1509..98fa0a46a96 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -1116,10 +1116,10 @@ get_num_bindings(struct zink_shader *zs, enum zink_descriptor_type type) } unsigned -zink_program_num_bindings_typed(const struct zink_program *pg, enum zink_descriptor_type type, bool is_compute) +zink_program_num_bindings_typed(const struct zink_program *pg, enum zink_descriptor_type type) { unsigned num_bindings = 0; - if (is_compute) { + if (pg->is_compute) { struct zink_compute_program *comp = (void*)pg; return get_num_bindings(comp->shader, type); } @@ -1132,11 +1132,11 @@ zink_program_num_bindings_typed(const struct zink_program *pg, enum zink_descrip } unsigned -zink_program_num_bindings(const struct zink_program *pg, bool is_compute) +zink_program_num_bindings(const struct zink_program *pg) { unsigned num_bindings = 0; for (unsigned i = 0; i < ZINK_DESCRIPTOR_BASE_TYPES; i++) - num_bindings += zink_program_num_bindings_typed(pg, i, is_compute); + num_bindings += zink_program_num_bindings_typed(pg, i); return num_bindings; } diff --git a/src/gallium/drivers/zink/zink_program.h b/src/gallium/drivers/zink/zink_program.h index df7aa5d30ac..2bcf279cfa8 100644 --- a/src/gallium/drivers/zink/zink_program.h +++ b/src/gallium/drivers/zink/zink_program.h @@ -105,10 +105,10 @@ void * zink_create_gfx_shader_state(struct pipe_context *pctx, const struct pipe_shader_state *shader); unsigned -zink_program_num_bindings_typed(const struct zink_program *pg, enum zink_descriptor_type type, bool is_compute); +zink_program_num_bindings_typed(const struct zink_program *pg, enum zink_descriptor_type type); unsigned -zink_program_num_bindings(const struct zink_program *pg, bool is_compute); +zink_program_num_bindings(const struct zink_program *pg); bool zink_program_descriptor_is_buffer(struct zink_context *ctx, gl_shader_stage stage, enum zink_descriptor_type type, unsigned i);