From: Christian Gmeiner <christian.gmeiner@gmail.com>
Date: Mon, 12 Aug 2019 09:09:47 +0000 (+0200)
Subject: etnaviv: fix compile warnings in release build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=914ecc9384ef31411bb06178f01cb0b2683fa344;p=mesa.git

etnaviv: fix compile warnings in release build

[27/31] Compiling C object 'src/gallium/drivers/etnaviv/df32d18@@etnaviv@sta/etnaviv_compiler_nir.c.o'.
In file included from ../../src/gitlab_mesa/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c:552:
../../src/gitlab_mesa/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.h: In function 'ra_assign':
../../src/gitlab_mesa/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.h:903:9: warning: unused variable 'ok' [-Wunused-variable]
    bool ok = ra_allocate(g);
         ^~
../../src/gitlab_mesa/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c: In function 'etna_compile_shader_nir':
../../src/gitlab_mesa/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c:663:9: warning: unused variable 'ok' [-Wunused-variable]
    bool ok = emit_shader(c->nir, &options, &v->num_temps, &num_consts);
         ^~

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Jonathan Marek <jonathan@marek.ca>
---

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
index 44e0c1a29fb..4aad246cfb9 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
@@ -660,7 +660,7 @@ etna_compile_shader_nir(struct etna_shader_variant *v)
    };
 
    unsigned num_consts;
-   bool ok = emit_shader(c->nir, &options, &v->num_temps, &num_consts);
+   ASSERTED bool ok = emit_shader(c->nir, &options, &v->num_temps, &num_consts);
    assert(ok);
 
    /* empty shader, emit NOP */
diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.h b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.h
index 0d30fe54dfd..c89ab9a9453 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.h
@@ -900,7 +900,7 @@ ra_assign(struct state *state, nir_shader *shader)
    ralloc_free(defs);
 
    /* Allocate registers */
-   bool ok = ra_allocate(g);
+   ASSERTED bool ok = ra_allocate(g);
    assert(ok);
 
    state->g = g;