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

venus: fix sample location info validity

Browse source 
Only look for sample location info when MSAA state is valid.

Test: dEQP-VK.api.pipeline.pipeline_invalid_pointers_unused_structs.graphics

Fixes: ff64092ff3 ("venus: support VK_EXT_sample_locations")
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33696>
This commit is contained in:
Yiwei Zhang 2025-02-22 22:26:25 -08:00
parent dd7bac4e31
commit ed4e2fac86
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/virtio/vulkan/vn_pipeline.c
View file

@ -1076,11 +1076,6 @@ vn_graphics_pipeline_state_fill(
const uint32_t lib_count = lib_info ? lib_info->libraryCount : 0;
const VkPipelineSampleLocationsStateCreateInfoEXT *sl_info = NULL;
if (info->pMultisampleState) {
sl_info = vk_find_struct_const(
info->pMultisampleState->pNext,
PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT);
}
/* This tracks which fields have valid values in the
* VkGraphicsPipelineCreateInfo pNext chain.
@ -1249,6 +1244,11 @@ vn_graphics_pipeline_state_fill(
* VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_ENABLE_EXT dynamic state is used
* or the static sampleLocationsEnable is true.
*/
if (info->pMultisampleState) {
sl_info = vk_find_struct_const(
info->pMultisampleState->pNext,
PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT);
}
if (!state->dynamic.sample_locations) {
if (state->dynamic.sample_locations_enable)
valid.self.multisample_state_sample_locations = true;