From 4736448bde7849974820763a1ab25f7a613b8e3d Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 6 Feb 2025 15:27:12 +0100 Subject: [PATCH] panvk: correct number of read bytes for dynamic buffers This function takes the number of bytes, not number of entries. This should hopefully fix start-up issues on Citra. While we're at it, fixup the alignment of the line that writes the bytes. Fixes: 27beadcbdb5 ("panvk: Extend the shader logic to support Valhall") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12539 Reviewed-by: Mary Guillemard Part-of: (cherry picked from commit 2ae97a4eb673243392b8566774e55a315abd1d38) --- .pick_status.json | 2 +- src/panfrost/vulkan/panvk_vX_shader.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6784be5d094..04a0ac4a52e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -564,7 +564,7 @@ "description": "panvk: correct number of read bytes for dynamic buffers", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "27beadcbdb51681a4eb3aaab990763d829009aef", "notes": null diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c index 0350635e52f..ce223a145f6 100644 --- a/src/panfrost/vulkan/panvk_vX_shader.c +++ b/src/panfrost/vulkan/panvk_vX_shader.c @@ -1191,6 +1191,7 @@ shader_desc_info_deserialize(struct blob_reader *blob, #else shader->desc_info.dyn_bufs.count = blob_read_uint32(blob); blob_copy_bytes(blob, shader->desc_info.dyn_bufs.map, + sizeof(*shader->desc_info.dyn_bufs.map) * shader->desc_info.dyn_bufs.count); #endif @@ -1291,7 +1292,7 @@ shader_desc_info_serialize(struct blob *blob, const struct panvk_shader *shader) blob_write_uint32(blob, shader->desc_info.dyn_bufs.count); blob_write_bytes(blob, shader->desc_info.dyn_bufs.map, sizeof(*shader->desc_info.dyn_bufs.map) * - shader->desc_info.dyn_bufs.count); + shader->desc_info.dyn_bufs.count); #endif }