KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lavapipe: fix pipeline handling for dynamic render zs state with pipeline library 

this is slightly more nuanced: if this is ONLY a fragment state,
pDepthStencilState must exist, but if it's BOTH fragment and output,
then pDepthStencilState must only exist if zs attachment is used

Fixes: d4d5a7abba ("lavapipe: implement EXT_graphics_pipeline_library")

Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16457>
This commit is contained in:
Mike Blumenkrantz 2022-05-11 13:06:11 -04:00 committed by Marge Bot
parent 0b2d383316
commit 5f83571f92
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gallium/frontends/lavapipe/lvp_pipeline.c
View File

@ -449,9 +449,25 @@ deep_copy_graphics_create_info(void *mem_ctx,
if (shaders & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_SHADER_BIT_EXT) {
assert(rp_info);
bool have_output = (shaders & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT) > 0;
/* pDepthStencilState */
if (src->pDepthStencilState && !rasterization_disabled &&
(has_depth || has_stencil)) {
/*
VUID-VkGraphicsPipelineCreateInfo-renderPass-06053
* If renderPass is VK_NULL_HANDLE, the pipeline is being created with fragment shader
state and fragment output interface state, and either of
VkPipelineRenderingCreateInfo::depthAttachmentFormat
or
VkPipelineRenderingCreateInfo::stencilAttachmentFormat
are not VK_FORMAT_UNDEFINED, pDepthStencilState must be a valid pointer to a valid
VkPipelineDepthStencilStateCreateInfo structure
VUID-VkGraphicsPipelineCreateInfo-renderPass-06590
* If renderPass is VK_NULL_HANDLE and the pipeline is being created with fragment shader
state but not fragment output interface state, pDepthStencilState must be a valid pointer
to a valid VkPipelineDepthStencilStateCreateInfo structure
*/
(!have_output || has_depth || has_stencil)) {
LVP_PIPELINE_DUP(dst->pDepthStencilState,
src->pDepthStencilState,
VkPipelineDepthStencilStateCreateInfo,