From 95167b212e8e62786ac147c23b56e8044eb37109 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Thu, 11 Jan 2024 19:27:57 -0800 Subject: [PATCH] venus: fix pipeline layout lifetime Should check the count instead of random ptr addr. Fixes: 19f2b9d0bbd ("venus: extend VkPipelineLayout lifetime for ...") Signed-off-by: Yiwei Zhang Part-of: (cherry picked from commit b551b6e48a4b69e0b1b6eb36acfbebe359025c24) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_pipeline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4b639e0c6eb..e0e08dee189 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -114,7 +114,7 @@ "description": "venus: fix pipeline layout lifetime", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "19f2b9d0bbd71ba218962a26434507e70f6cde98", "notes": null diff --git a/src/virtio/vulkan/vn_pipeline.c b/src/virtio/vulkan/vn_pipeline.c index 63e3ceeac96..32244eda7f5 100644 --- a/src/virtio/vulkan/vn_pipeline.c +++ b/src/virtio/vulkan/vn_pipeline.c @@ -356,7 +356,7 @@ vn_CreatePipelineLayout(VkDevice device, } } - layout->has_push_constant_ranges = pCreateInfo->pPushConstantRanges > 0; + layout->has_push_constant_ranges = pCreateInfo->pushConstantRangeCount > 0; VkPipelineLayout layout_handle = vn_pipeline_layout_to_handle(layout); vn_async_vkCreatePipelineLayout(dev->primary_ring, device, pCreateInfo,