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

panvk: Manually copy dynamic state in meta_gfx

Browse Source 
This fixes assertion for "dEQP-VK.dynamic_state.monolithic.image.*" when
the viewport state would have some dynamic state set before binding any
pipelines.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Fixes: f74dd596d5 ("panvk: Add helpers to save/restore the compute/graphics state for meta operations")
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30782>
This commit is contained in:
Mary Guillemard
2024-08-22 11:55:06 +02:00
committed by Marge Bot
parent 1d33aee197
commit ff24a8384c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/panfrost/vulkan/panvk_vX_cmd_meta.c
View File

@@ -83,10 +83,9 @@ panvk_per_arch(cmd_meta_gfx_start)(
save_ctx->vs.attribs = cmdbuf->state.gfx.vs.attribs;
save_ctx->vs.attrib_bufs = cmdbuf->state.gfx.vs.attrib_bufs;
save_ctx->dyn_state.all.vi = &save_ctx->dyn_state.vi;
save_ctx->dyn_state.all.ms.sample_locations = &save_ctx->dyn_state.sl;
vk_dynamic_graphics_state_copy(&save_ctx->dyn_state.all,
&cmdbuf->vk.dynamic_graphics_state);
save_ctx->dyn_state.all = cmdbuf->vk.dynamic_graphics_state;
save_ctx->dyn_state.vi = cmdbuf->state.gfx.dynamic.vi;
save_ctx->dyn_state.sl = cmdbuf->state.gfx.dynamic.sl;
}
void
@@ -120,8 +119,12 @@ panvk_per_arch(cmd_meta_gfx_end)(
cmdbuf->state.gfx.vs.attribs = save_ctx->vs.attribs;
cmdbuf->state.gfx.vs.attrib_bufs = save_ctx->vs.attrib_bufs;
vk_dynamic_graphics_state_copy(&cmdbuf->vk.dynamic_graphics_state,
&save_ctx->dyn_state.all);
cmdbuf->vk.dynamic_graphics_state = save_ctx->dyn_state.all;
cmdbuf->state.gfx.dynamic.vi = save_ctx->dyn_state.vi;
cmdbuf->state.gfx.dynamic.sl = save_ctx->dyn_state.sl;
memcpy(cmdbuf->vk.dynamic_graphics_state.dirty,
cmdbuf->vk.dynamic_graphics_state.set,
sizeof(cmdbuf->vk.dynamic_graphics_state.set));
}
VKAPI_ATTR void VKAPI_CALL