Mesa (main): zink: remove incorrect ASSERTED macro

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Aug 27 18:54:28 UTC 2021


Module: Mesa
Branch: main
Commit: 3e22fc27af95e80e13b06c389bf843d7315b6996
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e22fc27af95e80e13b06c389bf843d7315b6996

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Thu Aug 26 11:07:38 2021 +0200

zink: remove incorrect ASSERTED macro

The documentation for ASSERTED in macros.h says:

> Use ASSERTED to indicate that an identifier is unused outside of an `assert()`,
> so that assert-free builds don't get "unused variable" warnings.

We're using this variable outside of assert, so this shouldn't apply
here.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12594>

---

 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index af986ecafd3..7ff183ffe14 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -1865,7 +1865,7 @@ emit_load_const(struct ntv_context *ctx, nir_load_const_instr *load_const)
 static void
 emit_load_bo(struct ntv_context *ctx, nir_intrinsic_instr *intr)
 {
-   ASSERTED nir_const_value *const_block_index = nir_src_as_const_value(intr->src[0]);
+   nir_const_value *const_block_index = nir_src_as_const_value(intr->src[0]);
    bool ssbo = intr->intrinsic == nir_intrinsic_load_ssbo;
    assert(const_block_index); // no dynamic indexing for now
 



More information about the mesa-commit mailing list