lavapipe: skip post-copy pNext checking during pipeline creation for composites

these values should have all been set during pipeline compositing above,
so reapplying the values is at best, redundant, and at worst, broken

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17219>
(cherry picked from commit b74d3e71be)
This commit is contained in:
Mike Blumenkrantz 2022-06-23 10:28:16 -04:00 committed by Dylan Baker
parent ddaadc3da0
commit a15841aa8d
2 changed files with 3 additions and 4 deletions

View file

@ -274,7 +274,7 @@
"description": "lavapipe: skip post-copy pNext checking during pipeline creation for composites",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

View file

@ -1426,9 +1426,8 @@ lvp_graphics_pipeline_init(struct lvp_pipeline *pipeline,
}
}
}
}
if (pipeline->stages & VK_GRAPHICS_PIPELINE_LIBRARY_PRE_RASTERIZATION_SHADERS_BIT_EXT) {
} else if (pipeline->stages & VK_GRAPHICS_PIPELINE_LIBRARY_PRE_RASTERIZATION_SHADERS_BIT_EXT) {
/* composite pipelines should have these values set above */
if (pipeline->graphics_create_info.pViewportState) {
/* if pViewportState is null, it means rasterization is discarded,
* so this is ignored