Build failure in mesa 07ae697... (r600g: merge the TXQ and BUFFER constant
buffers, committer Dave Airlie)
make ends with the following error:
-----
CC r600_llvm.lo
r600_llvm.c: In function 'llvm_emit_tex':
r600_llvm.c:26:61: error: 'R600_TXQ_CONST_BUFFER' undeclared (first use in this
function)
 #define CONSTANT_TXQ_BUFFER (CONSTANT_BUFFER_0_ADDR_SPACE +
R600_TXQ_CONST_BUFFER)
                                                             ^
r600_llvm.c:693:46: note: in expansion of macro 'CONSTANT_TXQ_BUFFER'
     llvm_load_const_buffer(bld_base, offset, CONSTANT_TXQ_BUFFER),
                                              ^
r600_llvm.c:26:61: note: each undeclared identifier is reported only once for
each function it appears in
 #define CONSTANT_TXQ_BUFFER (CONSTANT_BUFFER_0_ADDR_SPACE +
R600_TXQ_CONST_BUFFER)
                                                             ^
r600_llvm.c:693:46: note: in expansion of macro 'CONSTANT_TXQ_BUFFER'
     llvm_load_const_buffer(bld_base, offset, CONSTANT_TXQ_BUFFER),
                                              ^
Makefile:813: recipe for target 'r600_llvm.lo' failed
make[3]: *** [r600_llvm.lo] Error 1
-----