diff --git a/.pick_status.json b/.pick_status.json index daa69454983..1b2be0a1e02 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -394,7 +394,7 @@ "description": "panvk: reset dyn_bufs map count to 0 in create_copy_table", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e350c334b6b2c7b420f326501533984c43d7c900", "notes": null diff --git a/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c b/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c index afbf440677f..0640aa41c95 100644 --- a/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c +++ b/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c @@ -1251,7 +1251,7 @@ create_copy_table(nir_shader *nir, struct lower_desc_ctx *ctx) } desc_info->dummy_sampler_handle = pan_res_handle(0, dummy_sampler_idx); - copy_count = desc_info->dyn_bufs.count + desc_info->dyn_bufs.count; + copy_count = desc_info->dyn_bufs.count; #endif if (copy_count == 0) @@ -1278,6 +1278,7 @@ create_copy_table(nir_shader *nir, struct lower_desc_ctx *ctx) desc_info->dyn_bufs_start = dummy_sampler_idx + 1; desc_info->dyn_bufs.map = rzalloc_array(ctx->ht, uint32_t, copy_count); + desc_info->dyn_bufs.count = 0; assert(desc_info->dyn_bufs.map); #endif