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

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>
(cherry picked from commit 417c51a511)
This commit is contained in:
Dave Airlie 2023-01-12 13:12:17 +10:00 • committed by Eric Engestrom
parent 8bad85053b
commit eaa4e81ea2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -6169,7 +6169,7 @@
"description": "lavapipe: fix one more descriptor set reference issue",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "20902d1ed685e97e135f4a16531793ddb7b4db69"
},

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

@ -716,7 +716,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,