OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swr: replace major llvm version checks with LLVM_VERSION_MAJOR

Browse Source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Eric Engestrom
2019-08-28 00:06:45 +01:00
parent 19d9e57f2c
commit 6120c442ee
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@
#pragma push_macro("DEBUG") #pragma push_macro("DEBUG")
#undef DEBUG #undef DEBUG
#include "JitManager.h" #include "JitManager.h"
#include <llvm/Config/llvm-config.h>
#include "llvm-c/Core.h" #include "llvm-c/Core.h"
#include "llvm/Support/CBindingWrapping.h" #include "llvm/Support/CBindingWrapping.h"
#include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/LegacyPassManager.h"
@@ -599,7 +600,7 @@ BuilderSWR::CompileGS(struct swr_context *ctx, swr_jit_gs_key &key)
GlobalValue::ExternalLinkage, GlobalValue::ExternalLinkage,
"GS", "GS",
JM()->mpCurrentModule); JM()->mpCurrentModule);
#if HAVE_LLVM < 0x0500 #if LLVM_VERSION_MAJOR < 5
AttributeSet attrSet = AttributeSet::get( AttributeSet attrSet = AttributeSet::get(
JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
@@ -773,7 +774,7 @@ BuilderSWR::CompileVS(struct swr_context *ctx, swr_jit_vs_key &key)
GlobalValue::ExternalLinkage, GlobalValue::ExternalLinkage,
"VS", "VS",
JM()->mpCurrentModule); JM()->mpCurrentModule);
#if HAVE_LLVM < 0x0500 #if LLVM_VERSION_MAJOR < 5
AttributeSet attrSet = AttributeSet::get( AttributeSet attrSet = AttributeSet::get(
JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
@@ -1059,7 +1060,7 @@ BuilderSWR::CompileFS(struct swr_context *ctx, swr_jit_fs_key &key)
GlobalValue::ExternalLinkage, GlobalValue::ExternalLinkage,
"FS", "FS",
JM()->mpCurrentModule); JM()->mpCurrentModule);
#if HAVE_LLVM < 0x0500 #if LLVM_VERSION_MAJOR < 5
AttributeSet attrSet = AttributeSet::get( AttributeSet attrSet = AttributeSet::get(
JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);