Skip to content

Commit 4eb5609

Browse files
sagarghuge20dancingmirrors
authored andcommitted
vulkan/runtime: Account for pipeline libraries stage count
Don't excludes stages coming from pipeline libraries. This caused valid group indices referring to library stages to be dropped, leading to mismatched stage_count. Cc: mesa-stable Fixes: e05a9b7 ("vulkan/runtime: split rt shaders hashing from compile") Signed-off-by: Sagar Ghuge <sagar.ghuge@intel.com>
1 parent e121df4 commit 4eb5609

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/vulkan/runtime/vk_pipeline.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3023,23 +3023,23 @@ vk_get_rt_pipeline_compile_info(struct vk_rt_pipeline_compile_info *info,
30233023
group->stage_count = 0;
30243024
switch (group_info->type) {
30253025
case VK_RAY_TRACING_SHADER_GROUP_TYPE_GENERAL_KHR:
3026-
assert(group_info->generalShader < pCreateInfo->stageCount);
3026+
assert(group_info->generalShader < info->stage_count);
30273027
group->stage_indices[group->stage_count++] = group_info->generalShader;
30283028
break;
30293029

30303030
case VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_KHR:
3031-
if (group_info->anyHitShader < pCreateInfo->stageCount)
3031+
if (group_info->anyHitShader < info->stage_count)
30323032
group->stage_indices[group->stage_count++] = group_info->anyHitShader;
3033-
if (group_info->closestHitShader < pCreateInfo->stageCount)
3033+
if (group_info->closestHitShader < info->stage_count)
30343034
group->stage_indices[group->stage_count++] = group_info->closestHitShader;
30353035
break;
30363036

30373037
case VK_RAY_TRACING_SHADER_GROUP_TYPE_PROCEDURAL_HIT_GROUP_KHR:
3038-
if (group_info->closestHitShader < pCreateInfo->stageCount)
3038+
if (group_info->closestHitShader < info->stage_count)
30393039
group->stage_indices[group->stage_count++] = group_info->closestHitShader;
3040-
if (group_info->anyHitShader < pCreateInfo->stageCount)
3040+
if (group_info->anyHitShader < info->stage_count)
30413041
group->stage_indices[group->stage_count++] = group_info->anyHitShader;
3042-
assert(group_info->intersectionShader < pCreateInfo->stageCount);
3042+
assert(group_info->intersectionShader < info->stage_count);
30433043
group->stage_indices[group->stage_count++] = group_info->intersectionShader;
30443044
break;
30453045

0 commit comments

Comments
 (0)