diff options
| author | Christian Gmeiner <cgmeiner@igalia.com> | 2024-08-21 09:50:15 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-08-30 12:45:58 +0000 |
| commit | 89e286892da4ff27e6820b6e4977fed674a9255f (patch) | |
| tree | 0b16e164cd3d1014527540e23bc90b21cff984d3 | |
| parent | f34bf161140e819cd7a22aa27708a04f516d27f6 (diff) | |
etnaviv: Switch to num_constants from etna_core_info
Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30806>
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_internal.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_screen.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_internal.h b/src/gallium/drivers/etnaviv/etnaviv_internal.h index 96c98f51341..c04df035519 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_internal.h +++ b/src/gallium/drivers/etnaviv/etnaviv_internal.h @@ -129,8 +129,6 @@ struct etna_specs { unsigned max_rendertarget_size; /* available pixel pipes */ unsigned pixel_pipes; - /* number of constants */ - unsigned num_constants; /* architecture version of NN cores */ unsigned nn_core_version; }; diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index 3a407c9c5aa..f0528a8a060 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -805,18 +805,18 @@ etna_determine_uniform_limits(struct etna_screen *screen) (screen->info->revision == 0x5118 || screen->info->revision == 0x5140)) { screen->specs.max_vs_uniforms = 256; screen->specs.max_ps_uniforms = 64; - } else if (screen->specs.num_constants == 320) { + } else if (screen->info->gpu.num_constants == 320) { screen->specs.max_vs_uniforms = 256; screen->specs.max_ps_uniforms = 64; - } else if (screen->specs.num_constants > 256 && + } else if (screen->info->gpu.num_constants > 256 && screen->info->model == chipModel_GC1000) { /* All GC1000 series chips can only support 64 uniforms for ps on non-unified const mode. */ screen->specs.max_vs_uniforms = 256; screen->specs.max_ps_uniforms = 64; - } else if (screen->specs.num_constants > 256) { + } else if (screen->info->gpu.num_constants > 256) { screen->specs.max_vs_uniforms = 256; screen->specs.max_ps_uniforms = 256; - } else if (screen->specs.num_constants == 256) { + } else if (screen->info->gpu.num_constants == 256) { screen->specs.max_vs_uniforms = 256; screen->specs.max_ps_uniforms = 256; } else { @@ -855,7 +855,6 @@ etna_get_specs(struct etna_screen *screen) 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.num_constants = info->gpu.num_constants; screen->specs.max_varyings = MIN2(info->gpu.max_varyings, ETNA_NUM_VARYINGS); if (screen->npu) |