Module: Mesa Branch: staging/23.0 Commit: 1f45634d20393e3d1ec17c509c81130e0148f706 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f45634d20393e3d1ec17c509c81130e0148f706
Author: Mike Blumenkrantz <[email protected]> Date: Tue Apr 18 12:23:47 2023 -0400 zink: avoid zero-sized memcmp for descriptor layouts cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22559> (cherry picked from commit cbac02b7d329e74a70d4effe7a757f35a76b3b88) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_descriptors.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0bf2881607d..c7e1fac0644 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2474,7 +2474,7 @@ "description": "zink: avoid zero-sized memcmp for descriptor layouts", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 521c9cb82ec..20ccb7f652e 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -95,7 +95,7 @@ equals_descriptor_layout(const void *a, const void *b) const struct zink_descriptor_layout_key *a_k = a; const struct zink_descriptor_layout_key *b_k = b; return a_k->num_bindings == b_k->num_bindings && - !memcmp(a_k->bindings, b_k->bindings, a_k->num_bindings * sizeof(VkDescriptorSetLayoutBinding)); + (!a_k->num_bindings || !memcmp(a_k->bindings, b_k->bindings, a_k->num_bindings * sizeof(VkDescriptorSetLayoutBinding))); } static struct zink_descriptor_layout *
