OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panvk: fix dummy sampler handle for vs

Browse Source 
When there is no dynamic buffer, create_copy_table early returns.  Make
sure dummy_sampler_handle is still set.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32018>
This commit is contained in:
Chia-I Wu
2024-11-06 15:02:45 -08:00
committed by Marge Bot
parent 7e737500bd
commit 879ec4270d
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c
View File

@@ -1017,6 +1017,10 @@ create_copy_table(nir_shader *nir, struct lower_desc_ctx *ctx)
for (uint32_t i = 0; i < PANVK_BIFROST_DESC_TABLE_COUNT; i++) for (uint32_t i = 0; i < PANVK_BIFROST_DESC_TABLE_COUNT; i++)
copy_count += desc_info->others[i].count; copy_count += desc_info->others[i].count;
#else #else
/* Dummy sampler comes after the vertex attributes. */
uint32_t dummy_sampler_idx = nir->info.stage == MESA_SHADER_VERTEX ? 16 : 0;
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 + desc_info->dyn_bufs.count;
#endif #endif
@@ -1040,6 +1044,9 @@ create_copy_table(nir_shader *nir, struct lower_desc_ctx *ctx)
desc_info->others[i].count = 0; desc_info->others[i].count = 0;
} }
#else #else
/* Dynamic buffers come after the dummy sampler. */
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.map = rzalloc_array(ctx->ht, uint32_t, copy_count);
assert(desc_info->dyn_bufs.map); assert(desc_info->dyn_bufs.map);
#endif #endif
@@ -1055,15 +1062,6 @@ create_copy_table(nir_shader *nir, struct lower_desc_ctx *ctx)
he->data = fill_copy_descs_for_binding(ctx, src.set, src.binding, he->data = fill_copy_descs_for_binding(ctx, src.set, src.binding,
src.subdesc, desc_count); src.subdesc, desc_count);
} }
#if PAN_ARCH >= 9
/* Dummy sampler comes after the vertex attributes. */
uint32_t dummy_sampler_idx = nir->info.stage == MESA_SHADER_VERTEX ? 16 : 0;
desc_info->dummy_sampler_handle = pan_res_handle(0, dummy_sampler_idx);
/* Dynamic buffers come after the dummy sampler. */
desc_info->dyn_bufs_start = dummy_sampler_idx + 1;
#endif
} }
/* TODO: Texture instructions support bindless through DTSEL_IMM(63), /* TODO: Texture instructions support bindless through DTSEL_IMM(63),