Module: Mesa
Branch: main
Commit: 3475c8cc4111cb28afc102488764a9cc51944086
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3475c8cc4111cb28afc102488764a9cc51944086
Author: Yiwei Zhang <zzyi...@chromium.org>
Date: Wed Nov 29 11:25:24 2023 -0800
venus: scrub msaa sample mask only with valid msaa state
No crash in
dEQP-VK.api.pipeline.pipeline_invalid_pointers_unused_structs.graphics
Fixes: 417437c7156 ("venus: pipeline fixes for VK_EXT_extended_dynamic_state3")
Signed-off-by: Yiwei Zhang <zzyi...@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26404>
---
src/virtio/vulkan/vn_pipeline.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/virtio/vulkan/vn_pipeline.c b/src/virtio/vulkan/vn_pipeline.c
index b47445ca937..bee2c2d1999 100644
--- a/src/virtio/vulkan/vn_pipeline.c
+++ b/src/virtio/vulkan/vn_pipeline.c
@@ -1178,6 +1178,7 @@ vn_graphics_pipeline_state_fill(
!valid.multisample_state &&
info->pMultisampleState,
.multisample_state_sample_mask =
+ valid.multisample_state &&
!valid.multisample_state_sample_mask &&
info->pMultisampleState &&
info->pMultisampleState->pSampleMask,
