From 8b0a409431bad0bae0da5ec956ef3b02e6e7ad38 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Wed, 21 Aug 2024 09:54:52 +0200 Subject: [PATCH] etnaviv: Switch to max_registers from etna_core_info Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach Part-of: --- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 5 +++-- src/gallium/drivers/etnaviv/etnaviv_internal.h | 2 -- src/gallium/drivers/etnaviv/etnaviv_screen.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index f8692c88b7f..d7906b0507e 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -1037,6 +1037,7 @@ emit_shader(struct etna_compile *c, unsigned *num_temps, unsigned *num_consts) static bool etna_compile_check_limits(struct etna_shader_variant *v) { + const struct etna_core_info *info = v->shader->info; const struct etna_specs *specs = v->shader->specs; int max_uniforms = (v->stage == MESA_SHADER_VERTEX) ? specs->max_vs_uniforms @@ -1048,9 +1049,9 @@ etna_compile_check_limits(struct etna_shader_variant *v) return false; } - if (v->num_temps > specs->max_registers) { + if (v->num_temps > info->gpu.max_registers) { DBG("Number of registers (%d) exceeds maximum %d", v->num_temps, - specs->max_registers); + info->gpu.max_registers); return false; } diff --git a/src/gallium/drivers/etnaviv/etnaviv_internal.h b/src/gallium/drivers/etnaviv/etnaviv_internal.h index c04df035519..dff92c8aff2 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_internal.h +++ b/src/gallium/drivers/etnaviv/etnaviv_internal.h @@ -117,8 +117,6 @@ struct etna_specs { uint32_t max_instructions; /* maximum number of varyings */ unsigned max_varyings; - /* maximum number of registers */ - unsigned max_registers; /* maximum vertex uniforms */ unsigned max_vs_uniforms; /* maximum pixel uniforms */ diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index f0528a8a060..7ddb8dff724 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -853,7 +853,6 @@ etna_get_specs(struct etna_screen *screen) if (info->type == ETNA_CORE_GPU) { instruction_count = info->gpu.max_instructions; screen->specs.stream_count = info->gpu.stream_count; - screen->specs.max_registers = info->gpu.max_registers; screen->specs.pixel_pipes = info->gpu.pixel_pipes; screen->specs.max_varyings = MIN2(info->gpu.max_varyings, ETNA_NUM_VARYINGS);