KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swr: push/pop DEBUG macro around llvm includes 

llvm redefines DEBUG; adding push/pop prevents a undefined reference
to debug_refcnt_state in llvm-3.7+.

v2: add undef DEBUG

Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
Tim Rowley 2016-06-16 21:09:35 -05:00
parent 805dbdf06d
commit 9ca741c645
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/swr/swr_shader.cpp
View File

@ -21,14 +21,18 @@
* IN THE SOFTWARE.
***************************************************************************/
// llvm redefines DEBUG
#pragma push_macro("DEBUG")
#undef DEBUG
#include "JitManager.h"
#include "llvm-c/Core.h"
#include "llvm/Support/CBindingWrapping.h"
#pragma pop_macro("DEBUG")
#include "state.h"
#include "state_llvm.h"
#include "builder.h"
#include "llvm-c/Core.h"
#include "llvm/Support/CBindingWrapping.h"
#include "tgsi/tgsi_strings.h"
#include "gallivm/lp_bld_init.h"
#include "gallivm/lp_bld_flow.h"

7
src/gallium/drivers/swr/swr_state.cpp
View File

@ -21,9 +21,14 @@
* IN THE SOFTWARE.
***************************************************************************/
// llvm redefines DEBUG
#pragma push_macro("DEBUG")
#undef DEBUG
#include "JitManager.h"
#pragma pop_macro("DEBUG")
#include "common/os.h"
#include "jit_api.h"
#include "JitManager.h"
#include "state_llvm.h"
#include "gallivm/lp_bld_tgsi.h"