Mesa (master): zink: assert all index values in ntv OpAccessChain constructor

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Dec 4 22:25:34 UTC 2020


Module: Mesa
Branch: master
Commit: 0223552fa0ac5d2116f8bfdda40b0193176682c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0223552fa0ac5d2116f8bfdda40b0193176682c9

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Dec  4 14:05:11 2020 -0500

zink: assert all index values in ntv OpAccessChain constructor

this is super annoying

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7933>

---

 src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
index df6d02168bd..7373ea64a95 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
@@ -396,8 +396,10 @@ spirv_builder_emit_access_chain(struct spirv_builder *b, SpvId result_type,
    spirv_buffer_emit_word(&b->instructions, result_type);
    spirv_buffer_emit_word(&b->instructions, result);
    spirv_buffer_emit_word(&b->instructions, base);
-   for (int i = 0; i < num_indexes; ++i)
+   for (int i = 0; i < num_indexes; ++i) {
+      assert(indexes[i]);
       spirv_buffer_emit_word(&b->instructions, indexes[i]);
+   }
    return result;
 }
 



More information about the mesa-commit mailing list