From 015f6a7aff46122d60d1cbee9d3ee8a7da002966 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 6 Nov 2024 21:30:33 -0800 Subject: [PATCH] panvk: ensure res table is restored after meta Set res_table to 0 to ensure that the res table is re-emitted. Signed-off-by: Chia-I Wu Fixes: 5067921349a ("panvk: Switch to vk_meta") Part-of: --- src/panfrost/vulkan/panvk_vX_cmd_meta.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/panfrost/vulkan/panvk_vX_cmd_meta.c b/src/panfrost/vulkan/panvk_vX_cmd_meta.c index cc6dda5c541..c4d2e4faf25 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_meta.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_meta.c @@ -71,6 +71,10 @@ panvk_per_arch(cmd_meta_compute_end)( cmdbuf->state.compute.shader = save_ctx->cs.shader; cmdbuf->state.compute.cs.desc = save_ctx->cs.desc; + +#if PAN_ARCH >= 9 + cmdbuf->state.compute.cs.desc.res_table = 0; +#endif } void @@ -136,6 +140,9 @@ panvk_per_arch(cmd_meta_gfx_end)( cmdbuf->state.gfx.vs.attribs = 0; cmdbuf->state.gfx.vs.attrib_bufs = 0; cmdbuf->state.gfx.fs.rsd = 0; +#else + cmdbuf->state.gfx.fs.desc.res_table = 0; + cmdbuf->state.gfx.vs.desc.res_table = 0; #endif cmdbuf->vk.dynamic_graphics_state = save_ctx->dyn_state.all;