fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 11:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/state: Fix default input attachment map values

Browse source 
When no input attachment location info is provided, the depth/stencil
attachment are supposed to be NO_INDEX, not UNUSED, and we should also
set the color_attachment_count to UNKNOWN.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32540>
This commit is contained in:
Boris Brezillon 2025-03-06 12:09:30 +01:00 • committed by Marge Bot
parent e321c438dc
commit 3669cc66c6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1071,8 +1071,8 @@ vk_input_attachment_location_state_init(struct vk_input_attachment_location_stat
*ial = (struct vk_input_attachment_location_state) { *ial = (struct vk_input_attachment_location_state) {
.color_map = { 0, 1, 2, 3, 4, 5, 6, 7 }, .color_map = { 0, 1, 2, 3, 4, 5, 6, 7 },
.color_attachment_count = MESA_VK_COLOR_ATTACHMENT_COUNT_UNKNOWN, .color_attachment_count = MESA_VK_COLOR_ATTACHMENT_COUNT_UNKNOWN,
.depth_att = MESA_VK_ATTACHMENT_UNUSED, .depth_att = MESA_VK_ATTACHMENT_NO_INDEX,
.stencil_att = MESA_VK_ATTACHMENT_UNUSED, .stencil_att = MESA_VK_ATTACHMENT_NO_INDEX,
}; };
if (!ial_info) if (!ial_info)
return; return;
@ -1939,8 +1939,9 @@ static const struct vk_dynamic_graphics_state vk_default_dynamic_graphics_state
}, },
.ial = { .ial = {
.color_map = { 0, 1, 2, 3, 4, 5, 6, 7 }, .color_map = { 0, 1, 2, 3, 4, 5, 6, 7 },
.depth_att = MESA_VK_ATTACHMENT_UNUSED, .color_attachment_count = MESA_VK_COLOR_ATTACHMENT_COUNT_UNKNOWN,
.stencil_att = MESA_VK_ATTACHMENT_UNUSED, .depth_att = MESA_VK_ATTACHMENT_NO_INDEX,
.stencil_att = MESA_VK_ATTACHMENT_NO_INDEX,
}, },
.cal = { .cal = {
.color_map = { 0, 1, 2, 3, 4, 5, 6, 7 }, .color_map = { 0, 1, 2, 3, 4, 5, 6, 7 },