fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 05:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: Always fill DS state for EXT_dynamic_rendering_unused_attachments

Browse source 
If renderpass has D/S attachment, but pipeline has D/S as UNDEFINED,
D/S should be properly disabled for the pipeline. The easiest way is to
ensure that D/S state is valid when pipeline's D/S format is UNDEFINED.
So we always create VkPipelineDepthStencilStateCreateInfo.

CC: mesa-stable

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37550>
(cherry picked from commit 2798ef7bfd)
This commit is contained in:
Danylo Piliaiev 2025-09-24 17:28:04 +02:00 • committed by Eric Engestrom
parent b2178afb93
commit 2162362f8b
2 changed files with 26 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3134,7 +3134,7 @@
"description": "vulkan: Always fill DS state for EXT_dynamic_rendering_unused_attachments",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

61
src/vulkan/runtime/vk_graphics_state.c
View file

@ -1588,42 +1588,8 @@ vk_graphics_pipeline_state_fill(const struct vk_device *device,
if (info->pMultisampleState != NULL)
needs |= MESA_VK_GRAPHICS_STATE_MULTISAMPLE_BIT;
/* From the Vulkan 1.3.218 spec:
*
* VUID-VkGraphicsPipelineCreateInfo-renderPass-06043
*
* "If renderPass is not VK_NULL_HANDLE, the pipeline is being
* created with fragment shader state, and subpass uses a
* depth/stencil attachment, pDepthStencilState must be a valid
* pointer to a valid VkPipelineDepthStencilStateCreateInfo
* structure"
*
* 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"
*
* In the first case, we'll have a real set of aspects in rp. In the
* second case, where we have both fragment shader and fragment output
* state, we will also have a valid set of aspects. In the third case
* where we only have fragment shader state and no render pass, the
* vk_render_pass_state will be incomplete.
*/
if (!vk_render_pass_state_has_attachment_info(&rp) ||
(rp.attachments & (MESA_VK_RP_ATTACHMENT_DEPTH_BIT |
MESA_VK_RP_ATTACHMENT_STENCIL_BIT)))
needs |= MESA_VK_GRAPHICS_STATE_DEPTH_STENCIL_BIT;
/* Always need D/S state due to VK_EXT_dynamic_rendering_unused_attachments */
needs |= MESA_VK_GRAPHICS_STATE_DEPTH_STENCIL_BIT;
needs |= MESA_VK_GRAPHICS_STATE_INPUT_ATTACHMENT_MAP_BIT;
}
@ -1767,6 +1733,29 @@ vk_graphics_pipeline_state_fill(const struct vk_device *device,
const VkRenderingAttachmentLocationInfoKHR *cal_info =
vk_find_struct_const(info->pNext, RENDERING_ATTACHMENT_LOCATION_INFO_KHR);
VkPipelineDepthStencilStateCreateInfo custom_ds_info;
/* With VK_EXT_dynamic_rendering_unused_attachments, we must explicitly
* disable depth and stencil if pDepthStencilState may not be a valid
* pointer. Dynamic renderpasses are allowed to have depth/stencil
* attachments even when the pipeline have them as VK_FORMAT_UNDEFINED,
* in which case pDepthStencilState may not be a valid pointer and we
* cannot access it even if depth/stencil state is statically specified
* by the pipeline.
*/
if ((needs & MESA_VK_GRAPHICS_STATE_DEPTH_STENCIL_BIT) &&
vk_render_pass_state_has_attachment_info(&rp)) {
bool has_depth = rp.attachments & MESA_VK_RP_ATTACHMENT_DEPTH_BIT;
bool has_stencil = rp.attachments & MESA_VK_RP_ATTACHMENT_STENCIL_BIT;
if (!has_depth && !has_stencil) {
custom_ds_info = (VkPipelineDepthStencilStateCreateInfo){
.depthTestEnable = false,
.stencilTestEnable = false,
};
ds_info = &custom_ds_info;
}
}
/*
* Finally, fill out all the states
*/