nir: fix const-cast warning on MSVC
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Thu, 3 Sep 2020 13:21:23 +0000 (15:21 +0200)
committerMarge Bot <eric+marge@anholt.net>
Fri, 4 Sep 2020 10:12:52 +0000 (10:12 +0000)
We're casting pointers to const memory to const pointers. MSVC complains
about this with the following warning:

warning C4090: 'initializing': different 'const' qualifiers

In this case, we can easily use both constnesses, because all we do is
read here. So let's avoid the warning by adding another const-keyword.

Fixes: 193765e26ba ("nir/lower_goto_if: Sort blocks in select_fork")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6582>

src/compiler/nir/nir_lower_goto_ifs.c

index de8c33a73329bd2c3373a1f1dd0662fa33abc281..44eaf729ec522a4e0ecb78a413cc5705035c0312 100644 (file)
@@ -85,8 +85,8 @@ struct strct_lvl {
 static int
 nir_block_ptr_cmp(const void *_a, const void *_b)
 {
-   nir_block *const *a = _a;
-   nir_block *const *b = _b;
+   const nir_block *const *a = _a;
+   const nir_block *const *b = _b;
    return (int)(*a)->index - (int)(*b)->index;
 }