OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavapipe: fix one more descriptor set reference issue

Browse Source 
I thought I'd fixed this already, must have gotten lost in a rebase.

fixes
dEQP-VK.pipeline.pipeline_library.graphics_library.misc.bind_null_descriptor_set.1010

Fixes: 20902d1ed6 ("lavapipe: fix descriptor set layout reference counting in layout merge")
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20662>
This commit is contained in:
Dave Airlie
2023-01-12 13:12:17 +10:00
parent f008a9baa7
commit 417c51a511
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/frontends/lavapipe/lvp_pipeline.c
View File

@@ -709,7 +709,8 @@ merge_layouts(struct vk_device *device, struct lvp_pipeline *dst, struct lvp_pip
for (unsigned i = 0; i < src->vk.set_count; i++) {
if (!dst->layout->vk.set_layouts[i]) {
dst->layout->vk.set_layouts[i] = src->vk.set_layouts[i];
vk_descriptor_set_layout_ref(src->vk.set_layouts[i]);
if (dst->layout->vk.set_layouts[i])
vk_descriptor_set_layout_ref(src->vk.set_layouts[i]);
}
}
dst->layout->vk.set_count = MAX2(dst->layout->vk.set_count,