sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-24 02:09:03 +03:00
Code Activity

vulkan/prores_ks_trellis_node: size the per-subgroup totals for the smallest subgroups

Browse Source 
The driver may run the shader with subgroups smaller than the maximum,
and the extra subgroups then wrote past the array.
This commit is contained in:
Lynne
2026-09-22 01:19:31 +09:00
parent 789730506b
commit 444564d519
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/proresenc_kostya_vulkan.c
View File

@@ -293,7 +293,8 @@ static int init_trellis_node_pipeline(ProresVulkanContext *pv, FFVulkanShader* s
int err = 0;
FFVulkanContext *vkctx = &pv->vkctx;
FFVulkanDescriptorSetBinding *desc;
int subgroup_size = vkctx->subgroup_props.maxSubgroupSize;
/* The driver picks the subgroup size; size for the most it may use */
int subgroup_size = vkctx->subgroup_props.minSubgroupSize;
int num_subgroups = FFALIGN(pv->ctx.mb_height, subgroup_size) / subgroup_size;
SPEC_LIST_CREATE(sl, 8, 8 * sizeof(uint32_t))

3
libavcodec/vulkan/prores_ks_trellis_node.comp.glsl
View File

@@ -172,7 +172,8 @@ void main() [[maximally_reconverges]]
slice_row_size = force_slice_row_quants();
int subgroup_sum = subgroupAdd(slice_row_size);
subgroup_sizes[gl_SubgroupID] = subgroup_sum;
if (subgroupElect())
subgroup_sizes[gl_SubgroupID] = subgroup_sum;
barrier();
int buf_start = subgroupExclusiveAdd(slice_row_size);