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

anv: pipelineStageCreationFeedbackCount is allowed to be 0

Browse Source 
Fixes: 6601e5d6fc ("anv: implement VK_EXT_pipeline_creation_feedback")

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18451>
(cherry picked from commit 92ee2e6b64)
This commit is contained in:
Iván Briano
2022-09-06 15:28:26 -07:00
committed by Dylan Baker
parent cbcf1bb4d8
commit 4b3daadae0
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -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"
},

16
src/intel/vulkan/anv_pipeline.c
View File

@@ -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;
}