Module: Mesa Branch: staging/22.2 Commit: 4b3daadae0ab3c7ee809b14d506f445bb059b74a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b3daadae0ab3c7ee809b14d506f445bb059b74a
Author: Iván Briano <[email protected]> Date: Tue Sep 6 15:28:26 2022 -0700 anv: pipelineStageCreationFeedbackCount is allowed to be 0 Fixes: 6601e5d6fc6 ("anv: implement VK_EXT_pipeline_creation_feedback") Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18451> (cherry picked from commit 92ee2e6b64369d3bdcb44e99e5a318588129950b) --- .pick_status.json | 2 +- src/intel/vulkan/anv_pipeline.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6d2e97852a6..ec4539651a8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3406,7 +3406,7 @@ "description": "anv: pipelineStageCreationFeedbackCount is allowed to be 0", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6601e5d6fc68cd9f8305508c650289170fef71ff" }, diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 6710020798d..c15d828dfdf 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -1755,8 +1755,9 @@ done: if (create_feedback) { *create_feedback->pPipelineCreationFeedback = pipeline_feedback; - assert(info->stageCount == create_feedback->pipelineStageCreationFeedbackCount); - for (uint32_t i = 0; i < info->stageCount; i++) { + uint32_t stage_count = create_feedback->pipelineStageCreationFeedbackCount; + assert(stage_count == 0 || info->stageCount == stage_count); + for (uint32_t i = 0; i < stage_count; i++) { gl_shader_stage s = vk_to_mesa_shader_stage(info->pStages[i].stage); create_feedback->pPipelineStageCreationFeedbacks[i] = stages[s].feedback; } @@ -1933,8 +1934,10 @@ anv_pipeline_compile_cs(struct anv_compute_pipeline *pipeline, if (create_feedback) { *create_feedback->pPipelineCreationFeedback = pipeline_feedback; - assert(create_feedback->pipelineStageCreationFeedbackCount == 1); - create_feedback->pPipelineStageCreationFeedbacks[0] = stage.feedback; + if (create_feedback->pipelineStageCreationFeedbackCount) { + assert(create_feedback->pipelineStageCreationFeedbackCount == 1); + create_feedback->pPipelineStageCreationFeedbacks[0] = stage.feedback; + } } pipeline->cs = bin; @@ -2668,8 +2671,9 @@ anv_pipeline_compile_ray_tracing(struct anv_ray_tracing_pipeline *pipeline, if (create_feedback) { *create_feedback->pPipelineCreationFeedback = pipeline_feedback; - assert(info->stageCount == create_feedback->pipelineStageCreationFeedbackCount); - for (uint32_t i = 0; i < info->stageCount; i++) { + uint32_t stage_count = create_feedback->pipelineStageCreationFeedbackCount; + assert(stage_count == 0 || info->stageCount == stage_count); + for (uint32_t i = 0; i < stage_count; i++) { gl_shader_stage s = vk_to_mesa_shader_stage(info->pStages[i].stage); create_feedback->pPipelineStageCreationFeedbacks[i] = stages[s].feedback; }
