From b6393d70402a60c124c1884d8d0cc1dc6a9b4ca5 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 20 Feb 2015 12:31:31 -0800 Subject: [PATCH] nir: Fix the Mesa build without -DDEBUG. With -DDEBUG -UNDEBUG, this assert uses reg_state::stack_size, which doesn't exist, breaking the build: assert(state->states[index].index < state->states[index].stack_size); Switch it to ifndef NDEBUG, so the field will exist if the assertion actually generates code. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner --- src/glsl/nir/nir_to_ssa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glsl/nir/nir_to_ssa.c b/src/glsl/nir/nir_to_ssa.c index dbe1699c54c..47cf45393e0 100644 --- a/src/glsl/nir/nir_to_ssa.c +++ b/src/glsl/nir/nir_to_ssa.c @@ -134,7 +134,7 @@ typedef struct { nir_ssa_def **stack; int index; unsigned num_defs; /** < used to add indices to debug names */ -#ifdef DEBUG +#ifndef NDEBUG unsigned stack_size; #endif } reg_state; @@ -489,7 +489,7 @@ init_rewrite_state(nir_function_impl *impl, rewrite_state *state) state->states[reg->index].stack = ralloc_array(state->states, nir_ssa_def *, stack_size); -#ifdef DEBUG +#ifndef NDEBUG state->states[reg->index].stack_size = stack_size; #endif state->states[reg->index].index = -1; -- 2.30.2