From ec914569524e9e9b5d49cbf5bfebf866d79c237e Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Mon, 21 Dec 2020 10:02:34 +0100 Subject: [PATCH] etnaviv: etnaviv: put sampler limit determination into own function Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach Part-of: --- src/gallium/drivers/etnaviv/etnaviv_screen.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index 9992dd1..8943446 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -675,6 +675,18 @@ etna_determine_uniform_limits(struct etna_screen *screen) } } +static void +etna_determine_sampler_limits(struct etna_screen *screen) +{ + /* vertex and fragment samplers live in one address space */ + screen->specs.vertex_sampler_offset = 8; + screen->specs.fragment_sampler_count = 8; + screen->specs.vertex_sampler_count = 4; + + if (screen->model == 0x400) + screen->specs.vertex_sampler_count = 0; +} + static bool etna_get_specs(struct etna_screen *screen) { @@ -770,15 +782,6 @@ etna_get_specs(struct etna_screen *screen) VIV_FEATURE(screen, chipMinorFeatures0, 2BITPERTILE) ? 0x55555555 : 0x11111111; - - /* vertex and fragment samplers live in one address space */ - screen->specs.vertex_sampler_offset = 8; - screen->specs.fragment_sampler_count = 8; - screen->specs.vertex_sampler_count = 4; - - if (screen->model == 0x400) - screen->specs.vertex_sampler_count = 0; - screen->specs.vs_need_z_div = screen->model < 0x1000 && screen->model != 0x880; screen->specs.has_sin_cos_sqrt = @@ -843,6 +846,7 @@ etna_get_specs(struct etna_screen *screen) } etna_determine_uniform_limits(screen); + etna_determine_sampler_limits(screen); if (screen->specs.halti >= 5) { screen->specs.has_unified_uniforms = true; -- 2.7.4