The patch "nir: Drop dependency on mtypes.h for core NIR." (commit bef38f62e026) broke my Gallium (r600g) build.


I build with:
./autogen.sh --with-gallium-drivers=r600 --with-dri-drivers= --enable-texture-float --disable-dri3 --disable-r600-llvm-compiler --disable-gallium-llvm CFLAGS="-O2 -march=native" CXXFLAGS="-O2 -march=native" --libdir=/usr/local/lib64 --prefix=/usr/local


Here is the error:
[...]
  CC       nir/nir_split_var_copies.lo
  CC       nir/nir_to_ssa.lo
  CC       nir/nir_validate.lo
  CC       nir/nir_worklist.lo
In file included from nir/../glsl_types.h:30:0,
                 from nir/nir_types.h:32,
                 from nir/nir.h:36,
                 from nir/nir_to_ssa.c:28:
nir/nir_to_ssa.c: In function 'rewrite_def_forwards':
nir/nir_to_ssa.c:226:60: error: 'reg_state' has no member named 'stack_size'
    assert(state->states[index].index < state->states[index].stack_size);
                                                            ^
Makefile:1602: recipe for target 'nir/nir_to_ssa.lo' failed
make[3]: *** [nir/nir_to_ssa.lo] Error 1
make[3]: *** Attente des tâches non terminées....
make[3]: Leaving directory '/home/benjamin/MESA/mesa/src/glsl'
Makefile:1209: recipe for target 'all' failed
make[2]: *** [all] Error 2
make[2]: Leaving directory '/home/benjamin/MESA/mesa/src/glsl'
Makefile:658: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/home/benjamin/MESA/mesa/src'
Makefile:601: recipe for target 'all-recursive' failed
make: *** [all-recursive] Error 1