From cdb4463b52d99f5fffd75b2692fed13c15ea07b6 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 20 Jun 2025 14:38:21 -0400 Subject: [PATCH] asahi,hk: fix ts allocation for more shader types 3c5c3d7819e ("hk: fix texture state count"), part 2. Backport-to: 25.1 Signed-off-by: Alyssa Rosenzweig Reviewed-by: Mary Guillemard Part-of: --- src/asahi/lib/agx_bg_eot.c | 1 + src/asahi/vulkan/hk_cmd_dispatch.c | 1 + src/asahi/vulkan/hk_shader.c | 1 + 3 files changed, 3 insertions(+) diff --git a/src/asahi/lib/agx_bg_eot.c b/src/asahi/lib/agx_bg_eot.c index 2b1325a49d6..d0a24eb3f6e 100644 --- a/src/asahi/lib/agx_bg_eot.c +++ b/src/asahi/lib/agx_bg_eot.c @@ -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; diff --git a/src/asahi/vulkan/hk_cmd_dispatch.c b/src/asahi/vulkan/hk_cmd_dispatch.c index 615ba970d7f..9866b3040e7 100644 --- a/src/asahi/vulkan/hk_cmd_dispatch.c +++ b/src/asahi/vulkan/hk_cmd_dispatch.c @@ -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; diff --git a/src/asahi/vulkan/hk_shader.c b/src/asahi/vulkan/hk_shader.c index 92398ee105b..046eb95c0b5 100644 --- a/src/asahi/vulkan/hk_shader.c +++ b/src/asahi/vulkan/hk_shader.c @@ -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); }