asahi,hk: fix ts allocation for more shader types

3c5c3d7819 ("hk: fix texture state count"), part 2.

Backport-to: 25.1
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35662>
This commit is contained in:
Alyssa Rosenzweig 2025-06-20 14:38:21 -04:00 committed by Marge Bot
parent d4b742f934
commit cdb4463b52
3 changed files with 3 additions and 0 deletions

View file

@ -262,6 +262,7 @@ agx_get_precompiled_locked(struct agx_bg_eot_cache *cache, unsigned program)
/* Bake launch */
agx_pack(&p->b.launch, CDM_LAUNCH_WORD_0, cfg) {
cfg.texture_state_register_count = 0;
cfg.sampler_state_register_count = 1;
cfg.uniform_register_count = info->push_count;
cfg.preshader_register_count = info->nr_preamble_gprs;

View file

@ -75,6 +75,7 @@ hk_dispatch_with_usc(struct hk_device *dev, struct hk_cs *cs,
{
struct agx_cdm_launch_word_0_packed launch;
agx_pack(&launch, CDM_LAUNCH_WORD_0, cfg) {
cfg.texture_state_register_count = 0;
cfg.sampler_state_register_count = 1;
cfg.uniform_register_count = info->push_count;
cfg.preshader_register_count = info->nr_preamble_gprs;

View file

@ -1603,6 +1603,7 @@ hk_fast_link(struct hk_device *dev, bool fragment, struct hk_shader *main,
cfg.cf_binding_count = s->b.cf.nr_bindings;
cfg.uniform_register_count = main->b.info.push_count;
cfg.preshader_register_count = main->b.info.nr_preamble_gprs;
cfg.texture_state_register_count = 0;
cfg.sampler_state_register_count =
agx_translate_sampler_state_count(s->b.uses_txf ? 1 : 0, false);
}