fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swr: Limit DEBUG workaround to LLVM < 7

Browse source 
As of version 7, LLVM uses LLVM_DEBUG instead of just DEBUG.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Michel Dänzer 2019-09-16 17:08:14 +02:00 • committed by Michel Dänzer
parent 8218f6e22d
commit 2c278602d8
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp
View file

@ -34,9 +34,13 @@
#pragma warning(disable : 4146 4244 4267 4800 4996)
#endif
#include <llvm/Config/llvm-config.h>
#if LLVM_VERSION_MAJOR < 7
// llvm 3.7+ reuses "DEBUG" as an enum value
#pragma push_macro("DEBUG")
#undef DEBUG
#endif
#include "llvm/IR/DataLayout.h"
#include "llvm/IR/Instructions.h"
@ -47,8 +51,6 @@
#include "llvm/IR/IntrinsicInst.h"
#include "llvm/ExecutionEngine/ObjectCache.h"
#include "llvm/Config/llvm-config.h"
#include "llvm/IR/Verifier.h"
#include "llvm/ExecutionEngine/MCJIT.h"
#include "llvm/Support/FileSystem.h"
@ -133,7 +135,9 @@ static inline llvm::AttributeSet GetFuncAttribSet(llvm::LLVMContext& ctx,
}
#endif
#if LLVM_VERSION_MAJOR < 7
#pragma pop_macro("DEBUG")
#endif
#include <deque>
#include <list>

9
src/gallium/drivers/swr/swr_shader.cpp
View file

@ -21,15 +21,22 @@
* IN THE SOFTWARE.
***************************************************************************/
#include <llvm/Config/llvm-config.h>
#if LLVM_VERSION_MAJOR < 7
// llvm redefines DEBUG
#pragma push_macro("DEBUG")
#undef DEBUG
#endif
#include "JitManager.h"
#include <llvm/Config/llvm-config.h>
#include "llvm-c/Core.h"
#include "llvm/Support/CBindingWrapping.h"
#include "llvm/IR/LegacyPassManager.h"
#if LLVM_VERSION_MAJOR < 7
#pragma pop_macro("DEBUG")
#endif
#include "state.h"
#include "gen_state_llvm.h"

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

@ -21,13 +21,20 @@
* IN THE SOFTWARE.
***************************************************************************/
#include <llvm/Config/llvm-config.h>
#if LLVM_VERSION_MAJOR < 7
// llvm redefines DEBUG
#pragma push_macro("DEBUG")
#undef DEBUG
#endif
#include <rasterizer/core/state.h>
#include "JitManager.h"
#if LLVM_VERSION_MAJOR < 7
#pragma pop_macro("DEBUG")
#endif
#include "common/os.h"
#include "jit_api.h"